You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2018/06/25 15:59:50 UTC
[geode] branch feature/GEODE-4791-remove-provided updated: Changing
a number of testCompileOnlys to testCompile
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch feature/GEODE-4791-remove-provided
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-4791-remove-provided by this push:
new 55af2ac Changing a number of testCompileOnlys to testCompile
55af2ac is described below
commit 55af2ac33b84961d2db1ee74c2f86c7973764cb3
Author: Dan Smith <up...@apache.org>
AuthorDate: Fri Jun 22 16:42:26 2018 -0700
Changing a number of testCompileOnlys to testCompile
The old provided configuration also was part of the test runtime
classpath. So the equivalent of provided with the built in gradle
configurations is compileOnly + testCompile.
---
extensions/session-testing-war/build.gradle | 1 +
geode-assembly/build.gradle | 2 +-
geode-core/build.gradle | 3 ++-
geode-cq/build.gradle | 2 +-
geode-protobuf/build.gradle | 2 +-
geode-pulse/build.gradle | 3 ++-
geode-rebalancer/build.gradle | 4 ++--
geode-wan/build.gradle | 2 +-
geode-web-api/build.gradle | 3 ++-
geode-web/build.gradle | 6 +++---
gradle/java.gradle | 1 +
11 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/extensions/session-testing-war/build.gradle b/extensions/session-testing-war/build.gradle
index f50ce1c..47b8bd3 100644
--- a/extensions/session-testing-war/build.gradle
+++ b/extensions/session-testing-war/build.gradle
@@ -18,6 +18,7 @@ apply plugin: 'war'
dependencies {
compileOnly 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
+ testCompile 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
}
war {
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 6cf41bb..8609535 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -54,7 +54,7 @@ configurations {
dependencies {
compileOnly project(':geode-core')
- testCompileOnly project(':geode-core')
+ testCompile project(':geode-core')
archives project(':geode-common')
archives project(':geode-json')
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index fc260aa..d409e1e 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -39,6 +39,7 @@ dependencies {
// External
compileOnly files("${System.getProperty('java.home')}/../lib/tools.jar")
+ testCompile files("${System.getProperty('java.home')}/../lib/tools.jar")
compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version'
compile 'org.jgroups:jgroups:' + project.'jgroups.version'
compile 'antlr:antlr:' + project.'antlr.version'
@@ -102,7 +103,7 @@ dependencies {
exclude module: 'spring-aop'
ext.optional = true
}
- testCompileOnly ('org.springframework:spring-webmvc:' + project.'springframework.version') {
+ testCompile ('org.springframework:spring-webmvc:' + project.'springframework.version') {
exclude module: 'aopalliance'
exclude module: 'spring-aop'
ext.optional = true
diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
index efb30fe..c5e4c02 100644
--- a/geode-cq/build.gradle
+++ b/geode-cq/build.gradle
@@ -17,7 +17,7 @@
dependencies {
compileOnly project(':geode-core')
- testCompileOnly project(':geode-core')
+ testCompile project(':geode-core')
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index 234d1f8..f0a0c49 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -17,7 +17,7 @@
dependencies {
compileOnly project(':geode-core')
- testCompileOnly project(':geode-core')
+ testCompile project(':geode-core')
compile project(':geode-protobuf-messages')
testCompile project(':geode-junit')
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index c26d636..f34cf64 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -75,8 +75,9 @@ dependencies {
providedCompile 'commons-logging:commons-logging:' + project.'commons-logging.version'
compileOnly 'org.mortbay.jetty:servlet-api:' + project.'mortbay-jetty-servlet-api.version'
+ testCompile 'org.mortbay.jetty:servlet-api:' + project.'mortbay-jetty-servlet-api.version'
compileOnly 'com.google.guava:guava:' + project.'guava.version'
- testCompileOnly 'com.google.guava:guava:' + project.'guava.version'
+ testCompile 'com.google.guava:guava:' + project.'guava.version'
testCompile project(':geode-junit')
testCompile project(':geode-core')
diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle
index 94263e3..e61f06d 100644
--- a/geode-rebalancer/build.gradle
+++ b/geode-rebalancer/build.gradle
@@ -17,9 +17,9 @@
dependencies {
compileOnly project(':geode-common')
- testCompileOnly project(':geode-common')
+ testCompile project(':geode-common')
compileOnly project(':geode-core')
- testCompileOnly project(':geode-core')
+ testCompile project(':geode-core')
compile ('org.springframework:spring-context:' + project.'springframework.version') {
exclude module: 'spring-beans'
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index bf9eeac..ce46d27 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -17,7 +17,7 @@
dependencies {
compileOnly project(':geode-core')
- testCompileOnly project(':geode-core')
+ testCompile project(':geode-core')
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile project(':geode-junit')
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index 623e7b1..346e3c8 100755
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -60,8 +60,9 @@ dependencies {
testCompile files(project(':geode-core').sourceSets.test.output)
compileOnly 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
+ testCompile 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
compileOnly project(':geode-core')
- testCompileOnly project(':geode-core')
+ testCompile project(':geode-core')
}
war {
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index c391fbe..736fd00 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -45,14 +45,14 @@ dependencies {
}
compileOnly 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
+ testCompile 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
// have to use output since we exclude the dependent classes from jar :(
- compileOnly project(path: ':geode-core')
- testCompileOnly project(path: ':geode-core')
+ compileOnly project(path: ':geode-core', configuration: 'classesOutput')
+ testCompile project(path: ':geode-core', configuration: 'classesOutput')
testCompile project(':geode-junit')
testRuntime project(':geode-common')
- testRuntime project(':geode-core')
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile 'com.pholser:junit-quickcheck-core:' + project.'junit-quickcheck.version'
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 10c61bf..00eda30 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -94,6 +94,7 @@ subprojects {
destinationDir = file("$buildDir/javadoc")
options.addStringOption('Xdoclint:none', '-quiet')
options.encoding = 'UTF-8'
+ classpath += configurations.compileOnly
}
}