diff --git a/authentication/build.gradle b/authentication/build.gradle
index d98ce66f9a4190d1905aac55581b5ce20031fe63..29de34a7e71c158020503fd09248e3c76c3a1ba0 100644
--- a/authentication/build.gradle
+++ b/authentication/build.gradle
@@ -3,23 +3,7 @@ evaluationDependsOn(':common')
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
dependencies {
- compile (project(':common')) {
- transitive = false
- }
+ compile project(':common')
- compile 'rinn:restrictions:1.0.1',
- 'cisd:cisd-base:r27861',
- 'apache:log4j:1.2.15',
- 'python:jython:2.5.2',
- 'apache:commons-httpclient:3.1',
- 'cisd:cisd-args4j:9.11.2'
-
- testCompile (project(path: ':common', configuration: 'tests')) {
- transitive = false
- }
-
- testCompile 'testng:testng:6.8-CISD',
- 'jmock:jmock:2.5.1'
-
- testRuntime 'fjelmer:classycle:1.4'
+ testCompile project(path: ':common', configuration: 'tests')
}
diff --git a/common/build.gradle b/common/build.gradle
index 66f488ffba564588cef7cdf481e33977607d4017..4b8519cc1ea3d987155f7aaa3978e794f5115873 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,22 +1,21 @@
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
dependencies {
- compile group: "cisd", name: "cisd-base", version: "+", changing: true
-
- compile 'springframework:spring-webmvc:+',
- 'springframework:spring-aop:+',
- 'javax:servlet-api:+',
- 'cisd:cisd-args4j:+',
- 'python:jython:+',
- 'apache:log4j:+',
- 'javax:mail:+',
- 'apache:commons-httpclient:+',
- 'apache:poi:+',
- 'twmacinta:fast-md5:+',
- 'google:gwt-servlet:+',
- 'jmock:jmock:+',
- 'testng:testng:+',
- 'marathon:marathon-spring-util:+'
+ compile 'springframework:spring-webmvc:+',
+ 'springframework:spring-aop:+',
+ 'javax:servlet-api:+',
+ 'cisd:cisd-args4j:+',
+ 'python:jython:+',
+ 'apache:log4j:+',
+ 'javax:mail:+',
+ 'apache:commons-httpclient:+',
+ 'apache:poi:+',
+ 'twmacinta:fast-md5:+',
+ 'google:gwt-servlet:+',
+ 'jmock:jmock:+',
+ 'testng:testng:+',
+ 'marathon:marathon-spring-util:+',
+ 'cisd:cisd-base:+'
testCompile 'fjelmer:classycle:+',
'hamcrest:hamcrest-integration:+',
diff --git a/dbmigration/build.gradle b/dbmigration/build.gradle
index a5eaeb5a39c337d43995f8270af198d8bb546275..3548314af8161bc6402596887889a25b16674e95 100644
--- a/dbmigration/build.gradle
+++ b/dbmigration/build.gradle
@@ -3,28 +3,12 @@ evaluationDependsOn(':common')
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
dependencies {
- compile (project(':common')) {
- transitive = false
- }
-
- compile 'springframework:spring-jdbc:2.5.6.SEC01',
- 'apache:commons-dbcp:1.3-CISD',
- 'h2database:h2:1.1.115',
- 'postgresql:postgresql:9.2-1000.jdbc4',
-
- 'cisd:cisd-base:r27861',
- 'apache:log4j:1.2.15',
- 'apache:commons-lang:2.4',
- 'rinn:restrictions:1.0.1'
-
-
- testCompile (project(path: ':common', configuration: 'tests')) {
- transitive = false
- }
-
- testCompile 'startnet:apgdiff:2.3',
- 'jmock:jmock:2.5.1',
- 'testng:testng:6.8-CISD'
+ compile project(':common'),
+ 'springframework:spring-jdbc:+',
+ 'apache:commons-dbcp:+',
+ 'h2database:h2:+',
+ 'postgresql:postgresql:+'
- testRuntime 'fjelmer:classycle:1.4'
+ testCompile project(path: ':common', configuration: 'tests'),
+ 'startnet:apgdiff:+'
}
diff --git a/gradle/javaproject.gradle b/gradle/javaproject.gradle
index 1a9edf8e71880814c112fbc45de3d03f5c2a43cd..e1ca1abcca1871967420dff5fb12e0c947b28e39 100644
--- a/gradle/javaproject.gradle
+++ b/gradle/javaproject.gradle
@@ -157,4 +157,24 @@ configurations {
artifacts {
tests testJar
+}
+
+task compileDependencies(type: Copy) {
+ into "$buildDir/output/compile-dependencies"
+ from configurations.compile
+}
+
+task runtimeDependencies(type: Copy) {
+ into "$buildDir/output/runtime-dependencies"
+ from configurations.runtime
+}
+
+task testCompileDependencies(type: Copy) {
+ into "$buildDir/output/testCompile-dependencies"
+ from configurations.testCompile
+}
+
+task testRuntimeDependencies(type: Copy) {
+ into "$buildDir/output/testRuntime-dependencies"
+ from configurations.testRuntime
}
\ No newline at end of file
diff --git a/openbis-common/build.gradle b/openbis-common/build.gradle
index e250de04406ebabae863b63b5c62e84e896e907a..c1c0aeb9c29a3e6a0bc50e6074f6ebb0a4d3507e 100644
--- a/openbis-common/build.gradle
+++ b/openbis-common/build.gradle
@@ -3,37 +3,14 @@ evaluationDependsOn(':common')
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
dependencies {
- compile (project(':common')) {
- transitive = false
- }
-
- compile 'googlecode:jsonrpc4j:0.24-CISD',
- 'reflections:reflections:0.9.5',
- 'cisd:cisd-jhdf5:r28568',
- 'lemnik:eodsql:2.2-CISD',
-
- 'springframework:spring-jdbc:2.5.6.SEC01',
- 'apache:commons-lang:2.4',
- 'rinn:restrictions:1.0.1',
- 'springframework:spring-webmvc:2.5.6.SEC01-CISD',
- 'javax:servlet-api:3.0',
- 'apache:log4j:1.2.15',
- 'google:gwt-servlet:2.4',
- 'cisd:cisd-base:r27861',
- 'truezip:truezip:6.8.1',
- 'springframework:spring-aop:2.5.6.SEC01'
-
-
- testCompile (project(path: ':common', configuration: 'tests')) {
- transitive = false
- }
-
- testCompile 'hamcrest:hamcrest-integration:1.1',
- 'eclipse:jetty-servlet:8.1.8.v20121106',
- 'testng:testng:6.8-CISD',
- 'jmock:jmock:2.5.1'
+ compile project(':common'),
+ 'googlecode:jsonrpc4j:+',
+ 'reflections:reflections:+',
+ 'cisd:cisd-jhdf5:+',
+ 'lemnik:eodsql:+',
+ 'springframework:spring-jdbc:+',
+ 'truezip:truezip:+'
- testRuntime 'fjelmer:classycle:1.4',
- 'marathon:marathon-spring-util:1.2.3',
- 'apache:commons-httpclient:3.1'
+ testCompile project(path: ':common', configuration: 'tests'),
+ 'eclipse:jetty-servlet:+'
}
\ No newline at end of file
diff --git a/openbis/build.gradle b/openbis/build.gradle
index 979cd660534e6a40fad8c02454b9bbae72a07d2a..336d1ddfb2b6240216be5a98d197487698fb5938 100644
--- a/openbis/build.gradle
+++ b/openbis/build.gradle
@@ -6,104 +6,42 @@ evaluationDependsOn(':dbmigration')
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
-dependencies {
-
- compile (project(':common')) {
- transitive = false
- }
-
- compile (project(':openbis_api')) {
- transitive = false
- }
-
- compile (project(':openbis-common')) {
- transitive = false
- }
-
- compile (project(':authentication')) {
- transitive = false
- }
-
- compile (project(':dbmigration')) {
- transitive = false
- }
-
- compile 'cisd:cisd-base:r27861',
- 'javax:servlet-api:3.0',
- 'apache:log4j:1.2.15',
- 'cisd:cisd-args4j:9.11.2',
- 'springframework:spring-webmvc:2.5.6.SEC01-CISD',
- 'apache:poi:3.8-20120326',
- 'fasterxml:jackson-annotations:2.0.2',
- 'python:jython:2.5.2',
- 'sencha:gxt:2.2.5',
- 'springframework:spring-aop:2.5.6.SEC01',
- 'apache:commons-collections:4.01',
- 'google:gwt-debug-panel:1.0',
- 'javax:mail:1.4.3',
- 'springframework:spring-jdbc:2.5.6.SEC01',
- 'cisd:cisd-hotdeploy:13.01.0',
- 'hibernate:hibernate-core:3.6.10.Final-CISD',
- 'springframework:spring-orm:2.5.6.SEC01',
- 'googlecode:jsonrpc4j:0.24-CISD',
- 'lemnik:eodsql:2.2-CISD',
- 'unimi:fastutil:5.1.5',
- 'apache:commons-dbcp:1.3-CISD',
- 'javax:validation-api:1.0.0.GA',
- 'hibernate:hibernate-search:3.4.2.Final',
- 'lucene:lucene-highlighter:3.1.0',
- 'eclipse:jetty-util:8.1.8.v20121106',
- 'hibernate:hibernate-validator:4.2.0.Final',
- 'eclipse:jetty-deploy:8.1.8.v20121106',
- 'truezip:truezip:6.8.1',
- 'apache:poi-ooxml:3.8-20120326',
- 'google:gwt-user:2.4',
- 'google:gwt-dev:2.4'
-
- runtime (project(':common')) {
- transitive = true
- }
+configurations.create('testRuntimeFirst')
- runtime (project(':openbis_api')) {
- transitive = true
- }
-
- runtime (project(':openbis-common')) {
- transitive = true
- }
-
- runtime (project(':authentication')) {
- transitive = true
- }
-
- runtime (project(':dbmigration')) {
- transitive = true
- }
-
- testCompile (project(path: ':common', configuration: 'tests')) {
- transitive = false
- }
+dependencies {
+ compile project(':common'),
+ project(':openbis_api'),
+ project(':openbis-common'),
+ project(':authentication'),
+ project(':dbmigration'),
+ 'sencha:gxt:2.2.5',
+ 'lucene:lucene-highlighter:3.1.0',
+ 'hibernate:hibernate-search:3.4.2.Final',
+ 'eclipse:jetty-deploy:8.1.8.v20121106',
+ 'google:gwt-debug-panel:1.0',
+ 'google:gwt-user:2.4',
+ 'springframework:spring-orm:2.5.6.SEC01',
+ 'cisd:cisd-hotdeploy:13.01.0',
+ 'apache:poi-ooxml:3.8-20120326',
+ 'hibernate:hibernate-validator:4.2.0.Final',
+ 'unimi:fastutil:5.1.5',
+ 'apache:commons-collections:+'
+
+ testCompile project(path: ':common', configuration: 'tests'),
+ project(path: ':dbmigration', configuration: 'tests'),
+ 'springframework:spring-test:2.5.6.SEC01'
+
+ testRuntime project(path: ':common', configuration: 'tests'),
+ project(path: ':dbmigration', configuration: 'tests'),
+ 'apache:commons-fileupload:1.2.1'
+
+ testRuntimeFirst 'javax:servlet-api:+'
+}
- testCompile (project(path: ':dbmigration', configuration: 'tests')) {
- transitive = false
- }
-
- testCompile 'springframework:spring-test:2.5.6.SEC01',
- 'testng:testng:6.8-CISD',
- 'hamcrest:hamcrest-library:1.1',
- 'hamcrest:hamcrest-integration:1.1',
- 'jmock:jmock:2.5.1'
-
- testRuntime (project(path: ':common', configuration: 'tests')) {
- transitive = true
- }
+sourceSets.test.runtimeClasspath = configurations.testRuntimeFirst + sourceSets.test.runtimeClasspath
- testRuntime (project(path: ':dbmigration', configuration: 'tests')) {
- transitive = true
- }
-
- testRuntime 'fjelmer:classycle:1.4',
- 'apache:commons-fileupload:1.2.1'
+configurations {
+ testRuntime.exclude group: 'google', module: 'gwt-servlet'
}
sourceSets {
diff --git a/openbis_api/build.gradle b/openbis_api/build.gradle
index 7c547cf7e9ffcd0dd15f938d30bc23b191edf756..13a530cd1c1370988f40540e2e78f419b470a82f 100644
--- a/openbis_api/build.gradle
+++ b/openbis_api/build.gradle
@@ -3,12 +3,7 @@ evaluationDependsOn(':common')
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
dependencies {
- compile (project(':common')) {
- transitive = false
- }
-
- compile 'fasterxml:jackson-core:2.0.2',
- 'fasterxml:jackson-annotations:2.0.2',
-
- 'cisd:cisd-base:r27861'
+ compile project(':common'),
+ 'fasterxml:jackson-core:+',
+ 'fasterxml:jackson-annotations:+'
}