GEODE-1665: Remove bundled jar from source distribution Modified the geode-example to remove the bundled gradle wrapper jar from the source distribution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1fdcdb28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1fdcdb28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1fdcdb28 Branch: refs/heads/develop Commit: 1fdcdb2840dd7c646f3f6ddc53e5b388c5b59c9b Parents: 3c5c62f Author: Anthony Baker <aba...@apache.org> Authored: Thu Jul 14 12:02:57 2016 -0700 Committer: Anthony Baker <aba...@apache.org> Committed: Thu Jul 14 12:23:11 2016 -0700 ---------------------------------------------------------------------- geode-assembly/build.gradle | 23 ++++++++++++++--------- gradle/rat.gradle | 2 -- 2 files changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1fdcdb28/geode-assembly/build.gradle ---------------------------------------------------------------------- diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle index c410f59..37b5cb1 100755 --- a/geode-assembly/build.gradle +++ b/geode-assembly/build.gradle @@ -263,10 +263,10 @@ distributions { from writeBuildInfo from (rootDir) { exclude 'KEYS' - exclude 'gradlew' - exclude 'gradlew.bat' - exclude 'gradle/wrapper/gradle-wrapper.jar' - exclude '.gradle' + exclude '**/gradlew' + exclude '**/gradlew.bat' + exclude '**/gradle/wrapper/gradle-wrapper.jar' + exclude '**/.gradle' exclude '**/build/**' exclude 'geode-spark-connector/**/target/**' exclude 'geode-spark-connector/project/project' @@ -274,17 +274,22 @@ distributions { exclude '**/.classpath' exclude '**/.settings/**' exclude '**/build-eclipse/**' - exclude '.idea/**' + exclude '**/.idea/**' exclude '**/*.iml' exclude '**/*.ipr' exclude '**/*.iws' + exclude '**/.travis.yml' exclude '**/tags' //These directories are generated on the jenkins server by gradle - exclude 'caches' - exclude 'daemon' - exclude 'native' - exclude 'wrapper' + exclude '**/caches' + exclude '**/daemon' + exclude '**/native' + exclude '**/wrapper' + } + + into ('geode-examples') { + from project.file( 'src/src/dist/gradlew' ) } } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1fdcdb28/gradle/rat.gradle ---------------------------------------------------------------------- diff --git a/gradle/rat.gradle b/gradle/rat.gradle index 02bf85c..0ce82b9 100644 --- a/gradle/rat.gradle +++ b/gradle/rat.gradle @@ -44,8 +44,6 @@ rat { 'geode-spark-connector/sbt', // Geode examples - 'geode-examples/*/scripts/server*/', - 'geode-examples/*/scripts/locator*/', 'geode-examples/.idea/**', 'geode-examples/gradlew*/**', 'geode-examples/gradle/wrapper/**',