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.git
The following commit(s) were added to refs/heads/develop by this push:
new 964b6f4 GEODE-6382: Remove now-trivial utility.gradle
964b6f4 is described below
commit 964b6f40d038d15038331bc34b9f135e078d68f1
Author: Patrick Rhomberg <prhomb...@pivotal.io>
AuthorDate: Fri Feb 8 12:57:47 2019 -0800
GEODE-6382: Remove now-trivial utility.gradle
---
build.gradle | 2 --
gradle/ide.gradle | 3 ---
gradle/java.gradle | 2 +-
gradle/utilities.gradle | 37 -------------------------------------
4 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/build.gradle b/build.gradle
index 3f39259..2b14604 100755
--- a/build.gradle
+++ b/build.gradle
@@ -72,8 +72,6 @@ apply from: "${scriptDir}/geode-dependency-management.gradle"
// Those subprojects that are properly managed by Spring will apply this
plugin explicitly.
versionManagement.applySpringDependencyManagement = false
-// utilities.gradle MUST be read before publish.gradle for reasons
-apply from: "${scriptDir}/utilities.gradle"
apply from: "${scriptDir}/java.gradle"
apply from: "${scriptDir}/ide.gradle"
apply from: "${scriptDir}/dependency-resolution.gradle"
diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 164c820..13e30d2 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -49,9 +49,6 @@ subprojects {
}
}
}
- project {
- name = sanitizedName()
- }
// Several files have UTF-8 encoding and Eclipse running on Windows
// will have trouble unless we tell it to use UTF-8 encoding.
// This setting needs to go into the core.resources.prefs file,
diff --git a/gradle/java.gradle b/gradle/java.gradle
index ad6f681..8c7fdaa 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -92,7 +92,7 @@ subprojects {
// be created as libs/foo-sources.jar instead of
libs/extensions/foo-sources.jar for example.
tasks.all { task ->
if (task instanceof Jar) {
- baseName = sanitizedName()
+ baseName = project.name
}
}
diff --git a/gradle/utilities.gradle b/gradle/utilities.gradle
deleted file mode 100644
index d4152c4..0000000
--- a/gradle/utilities.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-buildscript {
- repositories {
- maven { url "https://plugins.gradle.org/m2/"; }
- }
-}
-
-allprojects {
- //These methods will be added to each individual project.
- //Use this for methods that access project variables (like project.name)
- //
- //What is is doing is adding properties to the extra properties of the
- //project. Each property is itself a closure.
- ext {
- sanitizedName = {
- // Intended to strip off 'extensions/' from the modules so that artifacts
- // don't end up in libs/extensions/
- def parts = project.name.split("/")
- return parts[parts.length - 1]
- }
- }
-}
