You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by jg...@apache.org on 2014/06/14 01:15:28 UTC
[1/2] git commit: SAMZA-283: Resolve gradle wrapper jar issue
Repository: incubator-samza
Updated Branches:
refs/heads/master 5abdf2b03 -> 2ff8fe870
SAMZA-283: Resolve gradle wrapper jar issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/011975f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/011975f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/011975f0
Branch: refs/heads/master
Commit: 011975f0e0a8f9559ecfdfa560b49a6e49658b3d
Parents: f236734
Author: Jakob Homan <jg...@apache.org>
Authored: Fri Jun 13 16:14:41 2014 -0700
Committer: Jakob Homan <jg...@apache.org>
Committed: Fri Jun 13 16:14:41 2014 -0700
----------------------------------------------------------------------
README.md | 8 ++++-
RELEASE.md | 10 ++++++
bootstrap.gradle | 31 ++++++++++++++++
build.gradle | 2 ++
gradle.properties | 4 +++
gradle/release.gradle | 51 +++++++++++++++++++++++++++
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 2 +-
8 files changed, 107 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/011975f0/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a1d71b1..d930a57 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,16 @@ Check out [Hello Samza](https://samza.incubator.apache.org/startup/hello-samza/0
### Building Samza
-To build Samza, run:
+To build Samza from a git checkout or binary release, run:
./gradlew clean build
+To build Samza from a source release, it is first necessary to download the gradle wrapper script above. This bootstrapping process requires Gradle to be installed on the source machine. Gradle is available through most package managers or directly from [its website](http://www.gradle.org/). To bootstrap the wrapper, run:
+
+ gradle -b bootstrap.gradle
+
+After the bootstrap script has completed, the regular gradlew instructions below are available.
+
#### Scala and YARN
Samza builds with [Scala](http://www.scala-lang.org/) 2.10 and [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) 2.2.0, by default. Use the -PscalaVersion switches to change Scala versions. Samza supports building Scala with 2.9.2, or 2.10.
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/011975f0/RELEASE.md
----------------------------------------------------------------------
diff --git a/RELEASE.md b/RELEASE.md
index 5a7eabc..3d34f9f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -10,3 +10,13 @@ To release to a local Maven repository:
./gradlew clean publishToMavenLocal
./gradlew -PscalaVersion=2.9.2 clean publishToMavenLocal
+
+To build a tarball suitable for an ASF source release (and its accompanying MD5 file):
+
+First, clean any non-checked-in files from git (this removes all such files without prompting):
+
+ git clean -d -f
+
+Then build the tarball:
+
+ ./gradlew clean sourceRelease
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/011975f0/bootstrap.gradle
----------------------------------------------------------------------
diff --git a/bootstrap.gradle b/bootstrap.gradle
new file mode 100644
index 0000000..49fb0d9
--- /dev/null
+++ b/bootstrap.gradle
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+/**
+ * This file allows a source release of Samza, which is prohibited
+ * from containing jars, to be able to download the gradle wrapper
+ * and its accompanying jars.
+ */
+
+defaultTasks 'downloadWrapper'
+
+task downloadWrapper(type: Wrapper) {
+ description = "Download the gradle wrapper and requisite files. Overwrites existing wrapper files."
+ gradleVersion = project.gradleVersion
+}
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/011975f0/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 7346bdb..1bbd5ca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,6 +39,7 @@ apply from: file('gradle/license.gradle')
apply from: file('gradle/environment.gradle')
apply from: file("gradle/dependency-versions.gradle")
apply from: file("gradle/dependency-versions-scala-" + scalaVersion + ".gradle")
+apply from: file("gradle/release.gradle")
allprojects {
apply plugin: 'idea'
@@ -286,3 +287,4 @@ project(":samza-test_$scalaVersion") {
systemProperties = System.properties.findAll { it.key.startsWith("samza") }
}
}
+
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/011975f0/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index da0de97..a940b4f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,3 +17,7 @@
group=org.apache.samza
version=0.7.0
scalaVersion=2.10
+
+gradleVersion=1.6
+
+org.gradle.jvmargs="-XX:MaxPermSize=512m"
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/011975f0/gradle/release.gradle
----------------------------------------------------------------------
diff --git a/gradle/release.gradle b/gradle/release.gradle
new file mode 100644
index 0000000..751255f
--- /dev/null
+++ b/gradle/release.gradle
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+project(':') {
+ apply plugin: 'base'
+}
+
+task sourceRelease(type: Tar) {
+ // TODO: Add release signing: http://www.gradle.org/docs/current/userguide/signing_plugin.html
+
+ description = "Build a source release, specifically excluding the build directories and gradle wrapper files"
+ compression = Compression.GZIP
+
+ baseName = "samza-sources-${project.version}-incubating"
+
+ from(project.rootDir) {
+ exclude '**/build'
+ exclude 'build'
+ exclude '.gradle'
+ exclude 'gradlew'
+ exclude 'gradlew.bat'
+ exclude 'gradle/wrapper/gradle-wrapper.jar'
+ exclude 'gradle/wrapper/gradle-wrapper.properties'
+ }
+
+ into(baseName)
+
+ // Set destination directory.
+ destinationDir = file("${project.buildDir}/distribution/source")
+
+ archiveName = "${baseName}.tgz"
+ doLast { // generate md5 checksum
+ ant.checksum file:"$destinationDir/$archiveName"
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/011975f0/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 610282a..666eff6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Thu Jul 11 22:18:11 PDT 2013
+#Fri Jun 13 10:45:15 PDT 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/011975f0/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 16bbbbf..91a7e26 100755
--- a/gradlew
+++ b/gradlew
@@ -7,7 +7,7 @@
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-XX:MaxPermSize=512m"
+DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-samza
Posted by jg...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-samza
Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/2ff8fe87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/2ff8fe87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/2ff8fe87
Branch: refs/heads/master
Commit: 2ff8fe87029cf073be199bae63e70df9873d0d1a
Parents: 011975f 5abdf2b
Author: Jakob Homan <jg...@apache.org>
Authored: Fri Jun 13 16:15:17 2014 -0700
Committer: Jakob Homan <jg...@apache.org>
Committed: Fri Jun 13 16:15:17 2014 -0700
----------------------------------------------------------------------
docs/_config.yml | 2 +
.../0.7.0/container/checkpointing.md | 17 ++++-
docs/learn/documentation/0.7.0/index.html | 1 +
docs/learn/documentation/0.7.0/jobs/logging.md | 2 +-
.../documentation/0.7.0/jobs/reprocessing.md | 67 ++++++++++++++++++++
5 files changed, 87 insertions(+), 2 deletions(-)
----------------------------------------------------------------------