[geode] branch develop updated: GEODE-5533 Support Gradle 4.9 publication enhancements (#2264)

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbarrett 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 3f51242  GEODE-5533 Support Gradle 4.9 publication enhancements (#2264)
3f51242 is described below

commit 3f51242334260c1e13f56690b3b698a707ee0130
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Mon Aug 6 15:38:18 2018 -0700

    GEODE-5533 Support Gradle 4.9 publication enhancements (#2264)
    
    * GEODE-5533 Support Gradle 4.9 publication enhancements
    
    Upgrading to Gradle 4.9 broke publish/install due to a non-existent jar
    output from geode-assembly. More diligent pruning of the archives
    configuration has fixed the problem.
    
    * include `install` task in Concourse build
    
    Co-authored-by: Patrick Rhomberg <pr...@pivotal.io>
---
 ci/scripts/build.sh         |  2 +-
 geode-assembly/build.gradle | 15 ++++++++++-----
 gradle/java.gradle          |  1 -
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
index 60d9fe3..54d2ce9 100755
--- a/ci/scripts/build.sh
+++ b/ci/scripts/build.sh
@@ -91,7 +91,7 @@ ln -s ${ROOT_DIR}/geode ${GEODE_BUILD_DIR}
 pushd ${GEODE_BUILD_DIR}
 set +e
 set -x
-./gradlew --no-daemon --parallel -PbuildId=${BUILD_ID} --system-prop "java.io.tmpdir=${TMPDIR}" build
+./gradlew --no-daemon --parallel -PbuildId=${BUILD_ID} --system-prop "java.io.tmpdir=${TMPDIR}" build install
 GRADLE_EXIT_STATUS=$?
 set +x
 set -e
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 6758cc9..970623d 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact;
-
 evaluationDependsOn(":geode-core")
 
 apply plugin: 'distribution'
@@ -29,10 +27,17 @@ extraArchive {
   tests = false
 }
 
-// Gradle doesn't automatically remove the jar artifact even though we disabled it
-// this causes publishing to fail.  So we nuke all the disabled artifacts from all configurations.
+logger.info("Gradle doesn't automatically remove the jar artifact even though we disabled it")
+logger.info("this causes publishing to fail.  So we nuke all the disabled artifacts from all configurations.")
 configurations.all {
-  artifacts.removeAll artifacts.findAll { it instanceof ArchivePublishArtifact && !it.archiveTask.enabled }
+  def configName = it.name
+  artifacts.each {
+    logger.info("Pruning configName = " + configName + " name=" + it.name + " extension=" + it.extension + " classifier=" + it.classifier)
+  }
+  artifacts.removeAll{ it.name == jar.baseName && it.extension == 'jar' && it.classifier == jar.classifier }
+  if (artifacts) {
+    logger.info("Artifacts are now: " + artifacts)
+  }
 }
 
 gradle.taskGraph.whenReady( { graph ->
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 1f9c1ec..a55b74a 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -23,7 +23,6 @@ allprojects {
 }
 
 subprojects {
-  apply plugin: 'java'
 
   String javaVersion = System.properties['java.version']
   if (javaVersion.startsWith("1.8.0") && javaVersion.split("_")[1].toInteger() < 121) {