You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2018/12/06 17:45:39 UTC
[geode] branch develop updated: GEODE-6129: Make dependencies
explicit in geode-wan (#2940)
This is an automated email from the ASF dual-hosted git repository.
prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new d0bffea GEODE-6129: Make dependencies explicit in geode-wan (#2940)
d0bffea is described below
commit d0bffea74a817bf364d155b162c78db7a0ae4cab
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Thu Dec 6 09:45:29 2018 -0800
GEODE-6129: Make dependencies explicit in geode-wan (#2940)
---
geode-wan/build.gradle | 39 ++++++++++++++++++++++++---
geode-wan/src/test/resources/expected-pom.xml | 8 ++++++
2 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index 16b253d..5e3f479 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -16,20 +16,53 @@
*/
dependencies {
- compileOnly(project(':geode-core'))
- testCompile(project(':geode-core'))
+ gradleLint.ignore {
+ // See GEODE-6128 -- ignore xml-apis in linter to avoid changes with every run.
+ upgradeTestCompile('xml-apis:xml-apis:1.4.01')
+ }
+ compile(project(':geode-core'))
+
+ compileOnly('org.apache.logging.log4j:log4j-api:2.11.1')
+
testCompile(project(':geode-junit')) {
exclude module: 'geode-core'
}
+
+ testCompile('org.assertj:assertj-core:' + project.'assertj-core.version')
+ testCompile('junit:junit:' + project.'junit.version')
+ testCompile('org.mockito:mockito-core:' + project.'mockito-core.version')
+
integrationTestCompile(project(':geode-junit')) {
exclude module: 'geode-core'
}
+
+ integrationTestCompile('org.assertj:assertj-core:' + project.'assertj-core.version')
+ integrationTestCompile('junit:junit:' + project.'junit.version')
+
distributedTestCompile(project(':geode-dunit')){
exclude module: 'geode-core'
}
+ distributedTestCompile(project(':geode-junit'))
+
+ distributedTestCompile('mx4j:mx4j:' + project.'mx4j.version')
+ distributedTestCompile('org.awaitility:awaitility:' + project.'awaitility.version')
+ distributedTestCompile('junit:junit:' + project.'junit.version')
+ distributedTestCompile('org.hamcrest:hamcrest-core:' + project.'hamcrest-all.version')
+ distributedTestCompile('org.hamcrest:hamcrest-library:' + project.'hamcrest-all.version')
+ distributedTestCompile('org.mockito:mockito-core:' + project.'mockito-core.version')
+ distributedTestCompile('org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version')
+ distributedTestCompile('org.apache.commons:commons-lang3:' + project.'commons-lang3.version')
+ distributedTestCompile('commons-io:commons-io:' + project.'commons-io.version')
+ distributedTestCompile('org.assertj:assertj-core:' + project.'assertj-core.version')
+ distributedTestCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
+
+ upgradeTestCompile(project(':geode-junit'))
upgradeTestCompile(project(':geode-dunit')) {
exclude module: 'geode-core'
}
+ upgradeTestCompile('org.awaitility:awaitility:' + project.'awaitility.version')
+ upgradeTestCompile('org.assertj:assertj-core:' + project.'assertj-core.version')
+ upgradeTestCompile('junit:junit:' + project.'junit.version')
+
upgradeTestRuntime(project(':geode-old-versions'))
- distributedTestCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
}
diff --git a/geode-wan/src/test/resources/expected-pom.xml b/geode-wan/src/test/resources/expected-pom.xml
index b2ad3dd..0ea0ed8 100644
--- a/geode-wan/src/test/resources/expected-pom.xml
+++ b/geode-wan/src/test/resources/expected-pom.xml
@@ -34,4 +34,12 @@
<developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection>
<url>https://github.com/apache/geode</url>
</scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geode</groupId>
+ <artifactId>geode-core</artifactId>
+ <version>1.9.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>