aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--assembly/pom.xml4
-rw-r--r--bagel/pom.xml4
-rw-r--r--core/pom.xml4
-rwxr-xr-xdev/audit-release/audit_release.py8
-rw-r--r--ec2/README2
-rwxr-xr-xec2/spark_ec2.py2
-rw-r--r--examples/pom.xml4
-rw-r--r--external/flume/pom.xml4
-rw-r--r--external/kafka/pom.xml4
-rw-r--r--external/mqtt/pom.xml4
-rw-r--r--external/twitter/pom.xml4
-rw-r--r--external/zeromq/pom.xml4
-rw-r--r--graphx/pom.xml2
-rw-r--r--mllib/pom.xml4
-rw-r--r--pom.xml30
-rw-r--r--project/SparkBuild.scala10
-rw-r--r--repl/pom.xml4
-rw-r--r--streaming/pom.xml4
-rw-r--r--tools/pom.xml4
-rw-r--r--yarn/alpha/pom.xml2
-rw-r--r--yarn/pom.xml2
-rw-r--r--yarn/stable/pom.xml2
22 files changed, 54 insertions, 58 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 8239604025..7ce30179e9 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>
diff --git a/bagel/pom.xml b/bagel/pom.xml
index 6155ab5f20..355f437c5b 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>
diff --git a/core/pom.xml b/core/pom.xml
index d3a81d564c..6626d7c1b9 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>
diff --git a/dev/audit-release/audit_release.py b/dev/audit-release/audit_release.py
index 4408658f5e..52c367d9b0 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:
diff --git a/ec2/README b/ec2/README
index 433da37b4c..72434f24bf 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
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index b0512ca891..25e8538189 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)")
diff --git a/examples/pom.xml b/examples/pom.xml
index 12a11821a4..709907cb7e 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>
diff --git a/external/flume/pom.xml b/external/flume/pom.xml
index a0e8b84514..95ff872196 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>
diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml
index fb37cd7988..979eb0ca62 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>
diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml
index cfa1870e98..2c476b402e 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>
diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml
index 077f88dc59..a443459594 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>
diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml
index 4c68294b7b..a40e55876e 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>
diff --git a/graphx/pom.xml b/graphx/pom.xml
index 4823ed1d4e..2b4d674221 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>
diff --git a/mllib/pom.xml b/mllib/pom.xml
index 9a61d7c3e4..c0e745dadb 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>
diff --git a/pom.xml b/pom.xml
index 5e8f58ee15..39995396b3 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:git@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:git@github.com:apache/incubator-spark.git</url>
+ <connection>scm:git:git@github.com:apache/spark.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/spark.git</developerConnection>
+ <url>scm:git:git@github.com:apache/spark.git</url>
<tag>HEAD</tag>
</scm>
<developers>
@@ -49,7 +49,7 @@
<email>matei.zaharia@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>dev@spark.incubator.apache.org</post>
- <subscribe>dev-subscribe@spark.incubator.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@spark.incubator.apache.org</unsubscribe>
+ <post>dev@spark.apache.org</post>
+ <subscribe>dev-subscribe@spark.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@spark.apache.org</unsubscribe>
</mailingList>
<mailingList>
<name>User Mailing List</name>
- <post>user@spark.incubator.apache.org</post>
- <subscribe>user-subscribe@spark.incubator.apache.org</subscribe>
- <unsubscribe>user-unsubscribe@spark.incubator.apache.org</unsubscribe>
+ <post>user@spark.apache.org</post>
+ <subscribe>user-subscribe@spark.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@spark.apache.org</unsubscribe>
</mailingList>
<mailingList>
<name>Commits Mailing List</name>
- <post>commits@spark.incubator.apache.org</post>
- <subscribe>commits-subscribe@spark.incubator.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@spark.incubator.apache.org</unsubscribe>
+ <post>commits@spark.apache.org</post>
+ <subscribe>commits-subscribe@spark.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@spark.apache.org</unsubscribe>
</mailingList>
</mailingLists>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index e004f90033..399886ca1b 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:git@github.com:apache/incubator-spark.git</connection>
- <url>scm:git:git@github.com:apache/incubator-spark.git</url>
+ <connection>scm:git:git@github.com:apache/spark.git</connection>
+ <url>scm:git:git@github.com:apache/spark.git</url>
</scm>
<developers>
<developer>
@@ -193,7 +193,7 @@ object SparkBuild extends Build {
<email>matei.zaharia@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>
diff --git a/repl/pom.xml b/repl/pom.xml
index 4c5f9720c8..3a6baf5c42 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>
diff --git a/streaming/pom.xml b/streaming/pom.xml
index acc1d23c7d..2f358c9938 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>
diff --git a/tools/pom.xml b/tools/pom.xml
index a27f0db6e5..67f2d780f3 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>
diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml
index b026128980..e076ca1d44 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>
diff --git a/yarn/pom.xml b/yarn/pom.xml
index c0e133dd60..be51679292 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>
diff --git a/yarn/stable/pom.xml b/yarn/stable/pom.xml
index 7c312206d1..0780f251b5 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 19:40:11 +0000