geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [4/4] incubator-geode git commit: GEODE-1695: Parameterize build metadata
Date Tue, 26 Jul 2016 22:15:42 GMT
GEODE-1695: Parameterize build metadata

Extract the product name and org into gradle.properties.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/84c8f428
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/84c8f428
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/84c8f428

Branch: refs/heads/develop
Commit: 84c8f4281e488c499ad331ba738d815dbdc0e242
Parents: 4c5a699
Author: Anthony Baker <abaker@apache.org>
Authored: Mon Jul 25 19:51:13 2016 -0700
Committer: Anthony Baker <abaker@apache.org>
Committed: Tue Jul 26 15:15:15 2016 -0700

----------------------------------------------------------------------
 extensions/geode-modules-assembly/build.gradle | 3 ---
 geode-core/build.gradle                        | 2 +-
 gradle.properties                              | 3 +++
 gradle/java.gradle                             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84c8f428/extensions/geode-modules-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle
index 412ba09..0f7518f 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -83,9 +83,6 @@ def configureTcServerAssembly = {
     from getJarArtifact(':extensions/geode-modules')
     from getJarArtifact(':extensions/geode-modules-tomcat7')
     from configurations.slf4jDeps
-    from('release/3rdparty_license') {
-      include "open_source_licenses*${version}.txt"
-    }
   }
   into('geode-p2p/bin') {
     from('release/scripts') {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84c8f428/geode-core/build.gradle
----------------------------------------------------------------------
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 030885e..40fda07 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -174,7 +174,7 @@ task createVersionPropertiesFile {
 
   doLast {
     def props = [
-      "Product-Name"      : "Apache Geode (incubating)",
+      "Product-Name"      : productName,
       "Product-Version"   : version,
       "Build-Id"          : "${System.env.USER} ${new Date().format('MMddyy')}".toString(),
       "Build-Date"        : new Date().format('yyyy-MM-dd HH:mm:ss Z'),

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84c8f428/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 0fa3765..8652313 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,6 +20,9 @@
 versionNumber = 1.0.0-incubating
 releaseType = -SNAPSHOT
 
+productName = Apache Geode (incubating)
+productOrg = Apache Software Foundation (ASF)
+
 org.gradle.daemon = true
 org.gradle.jvmargs = -Xmx2048m
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/84c8f428/gradle/java.gradle
----------------------------------------------------------------------
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 4acb4da..36d88dc 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -38,7 +38,7 @@ subprojects {
             "Created-By"        : System.getProperty("user.name"),
             "Title"             : rootProject.name,
             "Version"           : version,
-            "Organization"      : "Apache Software Foundation (ASF)"
+            "Organization"      : productOrg
           )
         }
 


Mime
View raw message