Simplify geode-install path for running examples
Authored-by: Robert Houghton <rhoughton@pivotal.io>
diff --git a/build.gradle b/build.gradle
index 604243b..d4b2302 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@
}
}
-def installDir = "$buildDir/apache-geode-${geodeVersion}"
+def installDir = "$buildDir/apache-geode"
configurations {
geodeDistribution
@@ -53,14 +53,22 @@
if (gradle.usingGeodeCompositeBuild) {
dependsOn(gradle.includedBuild('geode').task(':geode-assembly:distTar'))
}
- from tarTree(configurations.geodeDistribution.singleFile)
+ from {
+ tarTree(configurations.geodeDistribution.singleFile)
+ }
+ eachFile { fcp ->
+ fcp.path = fcp.path.replaceFirst("^apache-geode-[a-zA-Z0-9\\.\\-]+\\/", "apache-geode/")
+ }
into buildDir
+ includeEmptyDirs false
}
subprojects {
apply plugin: 'java-library'
dependencies {
+ // All callouts to org.apache.geode here, need to be specified in settings.gradle
+ // for composite build to work
api(platform("org.apache.geode:geode-all-bom:$geodeVersion"))
implementation("org.apache.geode:geode-core")
implementation("org.apache.geode:geode-cq")
diff --git a/settings.gradle b/settings.gradle
index 19ac5c0..ebbbaac 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -56,8 +56,10 @@
includeBuild(geodeDirectory) {
it.dependencySubstitution {
// Any submodule used by examples must should be listed here
+ it.substitute it.module("org.apache.geode:geode-all-bom") with it.project(':boms:geode-all-bom')
it.substitute it.module("org.apache.geode:geode-cq") with it.project(':geode-cq')
it.substitute it.module("org.apache.geode:geode-core") with it.project(':geode-core')
+ it.substitute it.module("org.apache.geode:geode-logging") with it.project(':geode-logging')
it.substitute it.module("org.apache.geode:apache-geode") with it.project(':geode-assembly')
}
}
