You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2019/04/03 22:26:37 UTC
[geode] branch develop updated: GEODE-6589: Parameterize gradle
project group for use in GradleBuildWithGeodeCoreAcceptanceTest (#3395)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe 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 91da098 GEODE-6589: Parameterize gradle project group for use in GradleBuildWithGeodeCoreAcceptanceTest (#3395)
91da098 is described below
commit 91da0981cc65dd5c43ca3685fef9e77db852312f
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Wed Apr 3 15:26:21 2019 -0700
GEODE-6589: Parameterize gradle project group for use in GradleBuildWithGeodeCoreAcceptanceTest (#3395)
---
geode-assembly/build.gradle | 10 +++++++++-
.../internal/rest/GradleBuildWithGeodeCoreAcceptanceTest.java | 7 ++++++-
.../resources/gradle-test-projects/management/build.gradle | 4 +---
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 0504a91..1a724a3 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -189,7 +189,10 @@ dependencies {
}
acceptanceTestCompile(project(':geode-assembly:geode-assembly-test'))
acceptanceTestCompile('org.apache.httpcomponents:httpclient')
- acceptanceTestCompile('org.gradle:gradle-tooling-api:5.2.1')
+
+ // This is used by 'gradle within gradle' tests. No need to bump this version; but if you do,
+ // don't have it be the same version as the outer gradle version.
+ acceptanceTestCompile('org.gradle:gradle-tooling-api:5.1.1')
uiTestCompile(project(':geode-core'))
@@ -232,6 +235,11 @@ dependencies {
}
}
+acceptanceTest {
+ // This is specifically used by GradleBuildWithGeodeCoreAcceptanceTest
+ systemProperty 'projectGroup', project.group
+}
+
tasks.register('defaultDistributionConfig', JavaExec) {
inputs.files {
project(':geode-core').sourceSets.main.runtimeClasspath
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/GradleBuildWithGeodeCoreAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/GradleBuildWithGeodeCoreAcceptanceTest.java
index 6859331..2013584 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/GradleBuildWithGeodeCoreAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/rest/GradleBuildWithGeodeCoreAcceptanceTest.java
@@ -44,6 +44,10 @@ public class GradleBuildWithGeodeCoreAcceptanceTest {
URL projectDir = ResourceUtils.getResource("/gradle-test-projects/management");
assertThat(projectDir).isNotNull();
+ String projectGroup = System.getProperty("projectGroup");
+ assertThat(projectGroup).as("'projectGroup' is not available as a system property")
+ .isNotBlank();
+
String geodeVersion = GemFireVersion.getGemFireVersion();
File buildDir = temp.getRoot();
@@ -58,7 +62,8 @@ public class GradleBuildWithGeodeCoreAcceptanceTest {
build.setStandardError(System.err);
build.setStandardOutput(System.out);
- build.withArguments("-PgeodeVersion=" + geodeVersion,
+ build.withArguments("-Pversion=" + geodeVersion,
+ "-Pgroup=" + projectGroup,
"-PgeodeHome=" + geodeHome.toString());
build.forTasks("installDist", "run");
diff --git a/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle b/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle
index 46c3118..6bb1470 100644
--- a/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle
+++ b/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle
@@ -18,15 +18,13 @@ plugins {
id 'application'
}
-version = '1.0'
-
repositories {
mavenLocal()
mavenCentral()
}
dependencies {
- compile("org.apache.geode:geode-core:${findProperty('geodeVersion')}")
+ compile("${project.group}:geode-core:${project.version}")
runtime('org.apache.logging.log4j:log4j-slf4j-impl:2.11.1')
}