You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2016/07/26 22:15:39 UTC

[1/4] incubator-geode git commit: GEODE-1695: Add comment describing buildId property

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 4c5a69949 -> c556f011a


GEODE-1695: Add comment describing buildId property


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

Branch: refs/heads/develop
Commit: c556f011a58e64e4252a54b46b9b393776d1ad39
Parents: 3668c1e
Author: Anthony Baker <ab...@apache.org>
Authored: Tue Jul 26 13:47:39 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Tue Jul 26 15:15:15 2016 -0700

----------------------------------------------------------------------
 gradle.properties | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c556f011/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 3d44d72..4d1cce9 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,10 @@
 # <blank>   - release
 versionNumber = 1.0.0-incubating
 releaseType = -SNAPSHOT
+
+# Set the buildId to add build metadata that can be viewed from
+# gfsh or pulse (`gfsh version --full`). Can be set using
+# `gradle -PbuildId=N ...` where N is an artibitrary string.
 buildId = 0
 
 productName = Apache Geode (incubating)


[2/4] incubator-geode git commit: GEODE-1695: Add buildId to gradle.properties

Posted by ab...@apache.org.
GEODE-1695: Add buildId to 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/cbe69b6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cbe69b6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cbe69b6d

Branch: refs/heads/develop
Commit: cbe69b6d155641c5f999247479c1a3e2d83e7753
Parents: 84c8f42
Author: Anthony Baker <ab...@apache.org>
Authored: Mon Jul 25 21:00:55 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Tue Jul 26 15:15:15 2016 -0700

----------------------------------------------------------------------
 geode-core/build.gradle | 2 +-
 gradle.properties       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cbe69b6d/geode-core/build.gradle
----------------------------------------------------------------------
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 40fda07..1d5ad4a 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -176,7 +176,7 @@ task createVersionPropertiesFile {
     def props = [
       "Product-Name"      : productName,
       "Product-Version"   : version,
-      "Build-Id"          : "${System.env.USER} ${new Date().format('MMddyy')}".toString(),
+      "Build-Id"          : "${System.env.USER} ${buildId}".toString(),
       "Build-Date"        : new Date().format('yyyy-MM-dd HH:mm:ss Z'),
       "Build-Platform"    : "${System.properties['os.name']} ${System.properties['os.version']} ${System.properties['os.arch']}".toString(),
       "Build-Java-Version": System.properties['java.version']

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cbe69b6d/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 8652313..3d44d72 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,7 @@
 # <blank>   - release
 versionNumber = 1.0.0-incubating
 releaseType = -SNAPSHOT
+buildId = 0
 
 productName = Apache Geode (incubating)
 productOrg = Apache Software Foundation (ASF)


[3/4] incubator-geode git commit: GEODE-1695: Use productName to build javadocs

Posted by ab...@apache.org.
GEODE-1695: Use productName to build javadocs


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

Branch: refs/heads/develop
Commit: 3668c1edef4be62dce744aedd6c00c097c3bd5c1
Parents: cbe69b6
Author: Anthony Baker <ab...@apache.org>
Authored: Mon Jul 25 21:24:53 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Tue Jul 26 15:15:15 2016 -0700

----------------------------------------------------------------------
 geode-assembly/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3668c1ed/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 499eca2..fd9f76c 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -214,7 +214,7 @@ task docs(type: Javadoc) {
     options.encoding='UTF-8'
     source parent.subprojects*.javadoc*.source
     classpath = files(parent.subprojects*.javadoc*.classpath)
-    title = "Apache Geode ${project.version}"
+    title = "${productName} ${project.version}"
     include 'com/gemstone/gemfire/**/'
     exclude 'com/gemstone/gemfire/internal/**/'
     exclude 'com/gemstone/gemfire/**/internal/**/'


[4/4] incubator-geode git commit: GEODE-1695: Parameterize build metadata

Posted by ab...@apache.org.
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 <ab...@apache.org>
Authored: Mon Jul 25 19:51:13 2016 -0700
Committer: Anthony Baker <ab...@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
           )
         }