This is an automated email from the ASF dual-hosted git repository. rhoughton pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-examples.git
The following commit(s) were added to refs/heads/develop by this push: new 6add395 GEODE-6532: Dependency changes to examples related to the Geode fix. (#92) 6add395 is described below commit 6add39598aa6dbf1180d2d77acf807715db56e43 Author: Robert Houghton <rhough...@pivotal.io> AuthorDate: Mon Feb 24 14:02:27 2020 -0800 GEODE-6532: Dependency changes to examples related to the Geode fix. (#92) Several transitive dependencies will be marked 'runtime' not 'compile' in the POM from geode, causing examples to not miss symbols. Declare those dependencies outright. (cherry picked from commit e974408674428770c35be3b444e022d2b9f1973e) --- build.gradle | 30 +++++++++++++++++------------- gradle.properties | 10 ++-------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 073ea65..604243b 100644 --- a/build.gradle +++ b/build.gradle @@ -58,21 +58,25 @@ task installGeode(type: Copy) { } subprojects { - apply plugin: 'java' + apply plugin: 'java-library' dependencies { - compile "org.apache.geode:geode-core:$geodeVersion" - compile "org.apache.geode:geode-cq:$geodeVersion" - compile "org.apache.geode:geode-logging:$geodeVersion" - compile 'com.google.guava:guava:25.1-jre' - - testCompile "com.jayway.awaitility:awaitility:$awaitilityVersion" - testCompile "junit:junit:$junitVersion" - testCompile "org.mockito:mockito-core:$mockitocoreVersion" - testCompile "com.github.stefanbirkner:system-rules:$systemrulesVersion" - testCompile "org.assertj:assertj-core:$assertjVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtime "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" + api(platform("org.apache.geode:geode-all-bom:$geodeVersion")) + implementation("org.apache.geode:geode-core") + implementation("org.apache.geode:geode-cq") + implementation("org.apache.geode:geode-logging") + implementation('com.google.guava:guava') + implementation('org.apache.commons:commons-lang3') + implementation("org.apache.logging.log4j:log4j-core") + + testImplementation("org.awaitility:awaitility") + testImplementation("junit:junit") + testImplementation("org.mockito:mockito-core") + testImplementation("com.github.stefanbirkner:system-rules") + testImplementation("org.assertj:assertj-core") + testImplementation('org.apache.httpcomponents:httpcore') + testImplementation('org.apache.httpcomponents:httpclient') + runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl" } jar { diff --git a/gradle.properties b/gradle.properties index 4328334..34efdd7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,11 +22,5 @@ geodeVersion = 1.11.0-SNAPSHOT geodeRepositoryUrl = geodeReleaseUrl = -# dependency versions -assertjVersion = 3.6.2 -awaitilityVersion = 1.7.0 -junitVersion = 4.12 -mockitocoreVersion = 2.19.1 -log4jVersion = 2.11.0 -systemrulesVersion = 1.16.1 -micrometerVersion = 1.2.0 +# dependency versions not found in geode-all-bom +micrometerVersion = 1.2.1