Repository: spark Updated Branches: refs/heads/master b70823c91 -> 1fd2bfd3d
Remove remaining references to incubation This removes some loose ends not caught by the other (incubating -> tlp) patches. @markhamstra this updates the version as you mentioned earlier. Author: Patrick Wendell <pwend...@gmail.com> Closes #51 from pwendell/tlp and squashes the following commits: d553b1b [Patrick Wendell] Remove remaining references to incubation Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1fd2bfd3 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1fd2bfd3 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1fd2bfd3 Branch: refs/heads/master Commit: 1fd2bfd3dd6c27a54880f0d7a658b39f358aa804 Parents: b70823c Author: Patrick Wendell <pwend...@gmail.com> Authored: Sun Mar 2 01:00:16 2014 -0800 Committer: Reynold Xin <r...@apache.org> Committed: Sun Mar 2 01:00:16 2014 -0800 ---------------------------------------------------------------------- assembly/pom.xml | 4 ++-- bagel/pom.xml | 4 ++-- core/pom.xml | 4 ++-- dev/audit-release/audit_release.py | 8 ++------ ec2/README | 2 +- ec2/spark_ec2.py | 2 +- examples/pom.xml | 4 ++-- external/flume/pom.xml | 4 ++-- external/kafka/pom.xml | 4 ++-- external/mqtt/pom.xml | 4 ++-- external/twitter/pom.xml | 4 ++-- external/zeromq/pom.xml | 4 ++-- graphx/pom.xml | 2 +- mllib/pom.xml | 4 ++-- pom.xml | 30 +++++++++++++++--------------- project/SparkBuild.scala | 10 +++++----- repl/pom.xml | 4 ++-- streaming/pom.xml | 4 ++-- tools/pom.xml | 4 ++-- yarn/alpha/pom.xml | 2 +- yarn/pom.xml | 2 +- yarn/stable/pom.xml | 2 +- 22 files changed, 54 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 8239604..7ce3017 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,14 +21,14 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> <artifactId>spark-assembly_2.10</artifactId> <name>Spark Project Assembly</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <properties> <spark.jar>${project.build.directory}/scala-${scala.binary.version}/${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar</spark.jar> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/bagel/pom.xml ---------------------------------------------------------------------- diff --git a/bagel/pom.xml b/bagel/pom.xml index 6155ab5..355f437 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-bagel_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Bagel</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index d3a81d5..6626d7c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-core_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Core</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/dev/audit-release/audit_release.py ---------------------------------------------------------------------- diff --git a/dev/audit-release/audit_release.py b/dev/audit-release/audit_release.py index 4408658..52c367d 100755 --- a/dev/audit-release/audit_release.py +++ b/dev/audit-release/audit_release.py @@ -31,10 +31,10 @@ import time import urllib2 ## Fill in release details here: -RELEASE_URL = "http://people.apache.org/~pwendell/spark-0.9.0-incubating-rc5/" +RELEASE_URL = "http://people.apache.org/~pwendell/spark-1.0.0-rc1/" RELEASE_KEY = "9E4FE3AF" RELEASE_REPOSITORY = "https://repository.apache.org/content/repositories/orgapachespark-1006/" -RELEASE_VERSION = "0.9.0-incubating" +RELEASE_VERSION = "1.0.0" SCALA_VERSION = "2.10.3" SCALA_BINARY_VERSION = "2.10" ## @@ -191,10 +191,6 @@ for artifact in artifacts: test("NOTICE" in base_files, "Tarball contains NOTICE file") test("LICENSE" in base_files, "Tarball contains LICENSE file") - os.chdir(os.path.join(WORK_DIR, dir_name)) - readme = "".join(open("README.md").readlines()) - disclaimer_part = "is an effort undergoing incubation" - test(disclaimer_part in readme, "README file contains disclaimer") os.chdir(WORK_DIR) for artifact in artifacts: http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/ec2/README ---------------------------------------------------------------------- diff --git a/ec2/README b/ec2/README index 433da37..72434f2 100644 --- a/ec2/README +++ b/ec2/README @@ -1,4 +1,4 @@ This folder contains a script, spark-ec2, for launching Spark clusters on Amazon EC2. Usage instructions are available online at: -http://spark.incubator.apache.org/docs/latest/ec2-scripts.html +http://spark.apache.org/docs/latest/ec2-scripts.html http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index b0512ca..25e8538 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -73,7 +73,7 @@ def parse_args(): parser.add_option("-v", "--spark-version", default="0.9.0", help="Version of Spark to use: 'X.Y.Z' or a specific git hash") parser.add_option("--spark-git-repo", - default="https://github.com/apache/incubator-spark", + default="https://github.com/apache/spark", help="Github repo from which to checkout supplied commit hash") parser.add_option("--hadoop-major-version", default="1", help="Major version of Hadoop (default: 1)") http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 12a1182..709907c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-examples_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Examples</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <repositories> <repository> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/external/flume/pom.xml ---------------------------------------------------------------------- diff --git a/external/flume/pom.xml b/external/flume/pom.xml index a0e8b84..95ff872 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-streaming-flume_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project External Flume</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/external/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index fb37cd7..979eb0c 100644 --- a/external/kafka/pom.xml +++ b/external/kafka/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-streaming-kafka_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project External Kafka</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/external/mqtt/pom.xml ---------------------------------------------------------------------- diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index cfa1870..2c476b4 100644 --- a/external/mqtt/pom.xml +++ b/external/mqtt/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-streaming-mqtt_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project External MQTT</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <repositories> <repository> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/external/twitter/pom.xml ---------------------------------------------------------------------- diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index 077f88d..a443459 100644 --- a/external/twitter/pom.xml +++ b/external/twitter/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-streaming-twitter_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project External Twitter</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/external/zeromq/pom.xml ---------------------------------------------------------------------- diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index 4c68294..a40e558 100644 --- a/external/zeromq/pom.xml +++ b/external/zeromq/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-streaming-zeromq_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project External ZeroMQ</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/graphx/pom.xml ---------------------------------------------------------------------- diff --git a/graphx/pom.xml b/graphx/pom.xml index 4823ed1..2b4d674 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/mllib/pom.xml ---------------------------------------------------------------------- diff --git a/mllib/pom.xml b/mllib/pom.xml index 9a61d7c..c0e745d 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-mllib_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project ML Library</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5e8f58e..3999539 100644 --- a/pom.xml +++ b/pom.xml @@ -25,10 +25,10 @@ </parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Spark Project Parent POM</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <licenses> <license> <name>Apache 2.0 License</name> @@ -37,9 +37,9 @@ </license> </licenses> <scm> - <connection>scm:git:g...@github.com:apache/incubator-spark.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git</developerConnection> - <url>scm:git:g...@github.com:apache/incubator-spark.git</url> + <connection>scm:git:g...@github.com:apache/spark.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/spark.git</developerConnection> + <url>scm:git:g...@github.com:apache/spark.git</url> <tag>HEAD</tag> </scm> <developers> @@ -49,7 +49,7 @@ <email>matei.zaha...@gmail.com</email> <url>http://www.cs.berkeley.edu/~matei</url> <organization>Apache Software Foundation</organization> - <organizationUrl>http://spark.incubator.apache.org</organizationUrl> + <organizationUrl>http://spark.apache.org</organizationUrl> </developer> </developers> <issueManagement> @@ -64,23 +64,23 @@ <mailingLists> <mailingList> <name>Dev Mailing List</name> - <post>d...@spark.incubator.apache.org</post> - <subscribe>dev-subscr...@spark.incubator.apache.org</subscribe> - <unsubscribe>dev-unsubscr...@spark.incubator.apache.org</unsubscribe> + <post>d...@spark.apache.org</post> + <subscribe>dev-subscr...@spark.apache.org</subscribe> + <unsubscribe>dev-unsubscr...@spark.apache.org</unsubscribe> </mailingList> <mailingList> <name>User Mailing List</name> - <post>u...@spark.incubator.apache.org</post> - <subscribe>user-subscr...@spark.incubator.apache.org</subscribe> - <unsubscribe>user-unsubscr...@spark.incubator.apache.org</unsubscribe> + <post>u...@spark.apache.org</post> + <subscribe>user-subscr...@spark.apache.org</subscribe> + <unsubscribe>user-unsubscr...@spark.apache.org</unsubscribe> </mailingList> <mailingList> <name>Commits Mailing List</name> - <post>comm...@spark.incubator.apache.org</post> - <subscribe>commits-subscr...@spark.incubator.apache.org</subscribe> - <unsubscribe>commits-unsubscr...@spark.incubator.apache.org</unsubscribe> + <post>commits@spark.apache.org</post> + <subscribe>commits-subscr...@spark.apache.org</subscribe> + <unsubscribe>commits-unsubscr...@spark.apache.org</unsubscribe> </mailingList> </mailingLists> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index e004f90..399886c 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -125,7 +125,7 @@ object SparkBuild extends Build { def sharedSettings = Defaults.defaultSettings ++ Seq( organization := "org.apache.spark", - version := "1.0.0-incubating-SNAPSHOT", + version := "1.0.0-SNAPSHOT", scalaVersion := "2.10.3", scalacOptions := Seq("-Xmax-classfile-name", "120", "-unchecked", "-deprecation", "-target:" + SCALAC_JVM_VERSION), @@ -174,7 +174,7 @@ object SparkBuild extends Build { <artifactId>apache</artifactId> <version>13</version> </parent> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <licenses> <license> <name>Apache 2.0 License</name> @@ -183,8 +183,8 @@ object SparkBuild extends Build { </license> </licenses> <scm> - <connection>scm:git:g...@github.com:apache/incubator-spark.git</connection> - <url>scm:git:g...@github.com:apache/incubator-spark.git</url> + <connection>scm:git:g...@github.com:apache/spark.git</connection> + <url>scm:git:g...@github.com:apache/spark.git</url> </scm> <developers> <developer> @@ -193,7 +193,7 @@ object SparkBuild extends Build { <email>matei.zaha...@gmail.com</email> <url>http://www.cs.berkeley.edu/~matei</url> <organization>Apache Software Foundation</organization> - <organizationUrl>http://spark.incubator.apache.org</organizationUrl> + <organizationUrl>http://spark.apache.org</organizationUrl> </developer> </developers> <issueManagement> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/repl/pom.xml ---------------------------------------------------------------------- diff --git a/repl/pom.xml b/repl/pom.xml index 4c5f972..3a6baf5 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-repl_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project REPL</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <properties> <deb.install.path>/usr/share/spark</deb.install.path> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/streaming/pom.xml b/streaming/pom.xml index acc1d23..2f358c9 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>spark-streaming_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Streaming</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <repositories> <repository> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index a27f0db..67f2d78 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -28,7 +28,7 @@ <artifactId>spark-tools_2.10</artifactId> <packaging>jar</packaging> <name>Spark Project Tools</name> - <url>http://spark.incubator.apache.org/</url> + <url>http://spark.apache.org/</url> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/yarn/alpha/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml index b026128..e076ca1 100644 --- a/yarn/alpha/pom.xml +++ b/yarn/alpha/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>yarn-parent_2.10</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/pom.xml b/yarn/pom.xml index c0e133d..be51679 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/1fd2bfd3/yarn/stable/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/stable/pom.xml b/yarn/stable/pom.xml index 7c31220..0780f25 100644 --- a/yarn/stable/pom.xml +++ b/yarn/stable/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>yarn-parent_2.10</artifactId> - <version>1.0.0-incubating-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent>