Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/datafu
diff --git a/build-plugin/src/main/java/org/adrianwalker/multilinestring/MultilineProcessor.java b/build-plugin/src/main/java/org/adrianwalker/multilinestring/MultilineProcessor.java
index cd58263..5fe247c 100644
--- a/build-plugin/src/main/java/org/adrianwalker/multilinestring/MultilineProcessor.java
+++ b/build-plugin/src/main/java/org/adrianwalker/multilinestring/MultilineProcessor.java
@@ -15,6 +15,9 @@
import javax.lang.model.element.TypeElement;
@SupportedAnnotationTypes({"org.adrianwalker.multilinestring.Multiline"})
+
+// This generates a warning with Java 8 - however, if we switch to Java 8 and use SourceVersion.RELEASE_8, it
+// prevents compilation with Java 7. So we'll keep it and ignore the warning
@SupportedSourceVersion(SourceVersion.RELEASE_7)
public final class MultilineProcessor extends AbstractProcessor {
private Processor delegator = null;
diff --git a/build.gradle b/build.gradle
index 4e227b4..4b7f396 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,9 +98,17 @@
apply plugin: 'com.fizzpod.sweeney'
+def isRelease = ext.release.toBoolean()
+
sweeney {
- // Must use JDK 1.7
- enforce type: "equal", expect: "1.7", value: {System.getProperty('java.version').substring(0,3)}
+ // Make sure official releases are built with Java version 1.7, as this is the minimum version required by Hadoop 2.7.
+ if (isRelease) {
+ enforce type: "equal", expect: "1.7", value: {System.getProperty('java.version').substring(0,3)}
+ }
+ // Otherwise required at least Java version 1.7
+ else {
+ enforce type: "range", expect: "[1.7,)", value: {System.getProperty('java.version')}
+ }
// Ensure the assemble tasks depend on the rat task
def flag = true
diff --git a/changes.md b/changes.md
index 5bbcfea..7bad5b1 100644
--- a/changes.md
+++ b/changes.md
@@ -1,3 +1,9 @@
+# 1.4.0
+
+Changes:
+
+* Removed MD5 hash for source release artifact.
+
# 1.3.3
Additions:
diff --git a/site/config.rb b/site/config.rb
index 1f5c505..9995ea9 100644
--- a/site/config.rb
+++ b/site/config.rb
@@ -61,20 +61,28 @@
helpers do
# Use this for the current release.
def current_source_release_link(version)
- "<a href=\"http://www.apache.org/dyn/closer.cgi/incubator/datafu/apache-datafu-incubating-#{version}/\">
- apache-datafu-incubating-#{version}</a>
- [ <a href=\"https://www.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.asc\">
+ "<a href=\"http://www.apache.org/dyn/closer.cgi/datafu/apache-datafu-#{version}/\">
+ apache-datafu-#{version}</a>
+ [ <a href=\"https://www.apache.org/dist/datafu/apache-datafu-#{version}/apache-datafu-sources-#{version}.tgz.asc\">
PGP</a> ]
- [ <a href=\"https://www.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.md5\">
- MD5</a> ]
- [ <a href=\"https://www.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.sha512\">
+ [ <a href=\"https://www.apache.org/dist/datafu/apache-datafu-#{version}/apache-datafu-sources-#{version}.tgz.sha512\">
SHA512</a> ]"
end
- # Use this for releases > 1.3.2 and < the current release
+ # Use this for old releases >= 1.4.0 and < current
def archived_source_release_link(version)
+ "<a href=\"https://archive.apache.org/dist/datafu/apache-datafu-#{version}/apache-datafu-sources-#{version}.tgz\">
+ apache-datafu-sources-#{version}.tgz</a>
+ [ <a href=\"https://archive.apache.org/dist/datafu/apache-datafu-#{version}/apache-datafu-sources-#{version}.tgz.asc\">
+ PGP</a> ]
+ [ <a href=\"https://archive.apache.org/dist/datafu/apache-datafu-#{version}/apache-datafu-sources-#{version}.tgz.sha512\">
+ SHA512</a> ]"
+ end
+
+ # Use this for old incubator releases > 1.3.2 and <= 1.3.3
+ def archived_incubator_source_release_link(version)
"<a href=\"https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz\">
- apache-datafu-incubating-#{version}</a>
+ apache-datafu-incubating-sources-#{version}.tgz</a>
[ <a href=\"https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.asc\">
PGP</a> ]
[ <a href=\"https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.md5\">
diff --git a/site/source/blog/2012-01-10-introducing-datafu.html.markdown b/site/source/blog/2012-01-10-introducing-datafu.html.markdown
index 9333074..c55affe 100644
--- a/site/source/blog/2012-01-10-introducing-datafu.html.markdown
+++ b/site/source/blog/2012-01-10-introducing-datafu.html.markdown
@@ -20,7 +20,7 @@
At LinkedIn, we make extensive use of [Apache Pig](http://pig.apache.org/) for performing [data analysis on Hadoop](http://engineering.linkedin.com/hadoop/user-engagement-powered-apache-pig-and-hadoop). Pig is a simple, high-level programming language that consists of just a few dozen operators and makes it easy to write MapReduce jobs. For more advanced tasks, Pig also supports [User Defined Functions](http://pig.apache.org/docs/r0.9.1/udf.html) (UDFs), which let you integrate custom code in Java, Python, and JavaScript into your Pig scripts.
-Over time, as we worked on data intensive products such as [People You May Know](http://www.linkedin.com/pymk-results) and [Skills](http://www.linkedin.com/skills/), we developed a large number of UDFs at LinkedIn. Today, I'm happy to announce that we have consolidated these UDFs into a single, general-purpose library called [DataFu](http://datafu.incubator.apache.org/) and we are open sourcing it under the Apache 2.0 license.
+Over time, as we worked on data intensive products such as [People You May Know](http://www.linkedin.com/pymk-results) and [Skills](http://www.linkedin.com/skills/), we developed a large number of UDFs at LinkedIn. Today, I'm happy to announce that we have consolidated these UDFs into a single, general-purpose library called [DataFu](http://datafu.apache.org/) and we are open sourcing it under the Apache 2.0 license.
DataFu includes UDFs for common statistics tasks, PageRank, set operations, bag operations, and a comprehensive suite of tests. Read on to learn more.
@@ -49,16 +49,16 @@
```pig
define Quartile datafu.pig.stats.Quantile('0.0','0.25','0.5','0.75','1.0');
-
+
temperature = LOAD 'temperature.txt' AS (id:chararray, temp:double);
-
+
temperature = GROUP temperature BY id;
-
+
temperature_quartiles = FOREACH temperature {
sorted = ORDER temperature by temp; -- must be sorted
GENERATE group as id, Quartile(sorted.temp) as quartiles;
}
-
+
DUMP temperature_quartiles
```
@@ -78,16 +78,16 @@
```pig
define Quartile datafu.pig.stats.StreamingQuantile('0.0','0.25','0.5','0.75','1.0');
-
+
temperature = LOAD 'temperature.txt' AS (id:chararray, temp:double);
-
+
temperature = GROUP temperature BY id;
-
+
temperature_quartiles = FOREACH temperature {
-- sort not necessary
GENERATE group as id, Quartile(temperature.temp) as quartiles;
}
-
+
DUMP temperature_quartiles
```
diff --git a/site/source/blog/2018-03-22-datafu-1-4-0-released.markdown b/site/source/blog/2018-03-22-datafu-1-4-0-released.markdown
new file mode 100644
index 0000000..1d9a25f
--- /dev/null
+++ b/site/source/blog/2018-03-22-datafu-1-4-0-released.markdown
@@ -0,0 +1,35 @@
+---
+title: Apache DataFu 1.4.0 Released
+author: Matthew Hayes
+license: >
+ 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.
+---
+
+I'd like to announce the release of Apache DataFu 1.4.0. This is the first release since graduating from Apache Incubator. Note that the artifacts now begin with `apache-datafu` instead of `apache-datafu-incubating`.
+
+Changes:
+
+* Removed MD5 hash for source release artifact.
+
+The source release can be obtained from:
+
+http://www.apache.org/dyn/closer.cgi/datafu/apache-datafu-1.4.0/
+
+Artifacts for DataFu are published in Apache's Maven Repository:
+
+https://repository.apache.org/content/groups/public/org/apache/datafu/
+
+Please visit the [Download](/docs/download.html) page for instructions on building from source or retrieving the artifacts in your build system.
\ No newline at end of file
diff --git a/site/source/docs/datafu/getting-started.html.markdown.erb b/site/source/docs/datafu/getting-started.html.markdown.erb
index 85721fb..058e049 100644
--- a/site/source/docs/datafu/getting-started.html.markdown.erb
+++ b/site/source/docs/datafu/getting-started.html.markdown.erb
@@ -1,6 +1,6 @@
---
title: Apache DataFu Pig - Getting Started
-version: 1.3.3
+version: 1.4.0
section_name: Getting Started
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -98,7 +98,7 @@
then register the DataFu JAR:
```pig
-register datafu-pig-incubating-<%= current_page.data.version %>.jar
+register datafu-pig-<%= current_page.data.version %>.jar
```
To compute the median we'll use DataFu's `StreamingMedian`, which computes an estimate of the median but has the benefit
diff --git a/site/source/docs/datafu/guide.html.markdown.erb b/site/source/docs/datafu/guide.html.markdown.erb
index 75cf57b..49a6363 100644
--- a/site/source/docs/datafu/guide.html.markdown.erb
+++ b/site/source/docs/datafu/guide.html.markdown.erb
@@ -1,6 +1,6 @@
---
title: Guide - Apache DataFu Pig
-version: 1.3.3
+version: 1.4.0
section_name: Apache DataFu Pig
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/site/source/docs/datafu/guide/bag-operations.html.markdown.erb b/site/source/docs/datafu/guide/bag-operations.html.markdown.erb
index fe5f754..baa8986 100644
--- a/site/source/docs/datafu/guide/bag-operations.html.markdown.erb
+++ b/site/source/docs/datafu/guide/bag-operations.html.markdown.erb
@@ -1,6 +1,6 @@
---
title: Bag Operations - Guide - Apache DataFu Pig
-version: 1.3.3
+version: 1.4.0
section_name: Apache DataFu Pig - Guide
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/site/source/docs/datafu/guide/hashing.html.markdown.erb b/site/source/docs/datafu/guide/hashing.html.markdown.erb
index 31e1505..667233f 100644
--- a/site/source/docs/datafu/guide/hashing.html.markdown.erb
+++ b/site/source/docs/datafu/guide/hashing.html.markdown.erb
@@ -1,6 +1,6 @@
---
title: Hashing - Guide - Apache DataFu Pig
-version: 1.3.3
+version: 1.4.0
section_name: Apache DataFu Pig - Guide
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/site/source/docs/datafu/guide/link-analysis.html.markdown.erb b/site/source/docs/datafu/guide/link-analysis.html.markdown.erb
index 0a9b4bb..4f107c1 100644
--- a/site/source/docs/datafu/guide/link-analysis.html.markdown.erb
+++ b/site/source/docs/datafu/guide/link-analysis.html.markdown.erb
@@ -1,6 +1,6 @@
---
title: Link Analysis - Guide - Apache DataFu Pig
-version: 1.3.3
+version: 1.4.0
section_name: Apache DataFu Pig - Guide
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/site/source/docs/datafu/guide/more-tips-and-tricks.html.markdown.erb b/site/source/docs/datafu/guide/more-tips-and-tricks.html.markdown.erb
index 4e2ca92..2355fbf 100644
--- a/site/source/docs/datafu/guide/more-tips-and-tricks.html.markdown.erb
+++ b/site/source/docs/datafu/guide/more-tips-and-tricks.html.markdown.erb
@@ -1,6 +1,6 @@
---
title: More Tips and Tricks - Guide - Apache DataFu Pig
-version: 1.3.3
+version: 1.4.0
section_name: Apache DataFu Pig - Guide
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/site/source/docs/datafu/guide/sampling.html.markdown.erb b/site/source/docs/datafu/guide/sampling.html.markdown.erb
index 2b65c05..b113a1c 100644
--- a/site/source/docs/datafu/guide/sampling.html.markdown.erb
+++ b/site/source/docs/datafu/guide/sampling.html.markdown.erb
@@ -1,6 +1,6 @@
---
title: Sampling - Guide - Apache DataFu Pig
-version: 1.3.3
+version: 1.4.0
section_name: Apache DataFu Pig - Guide
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/site/source/docs/datafu/guide/sessions.html.markdown.erb b/site/source/docs/datafu/guide/sessions.html.markdown.erb
index c6f4503..e233a20 100644
--- a/site/source/docs/datafu/guide/sessions.html.markdown.erb
+++ b/site/source/docs/datafu/guide/sessions.html.markdown.erb
@@ -1,6 +1,6 @@
---
title: Sessions - Guide - Apache DataFu Pig
-version: 1.3.3
+version: 1.4.0
section_name: Apache DataFu Pig - Guide
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/site/source/docs/datafu/guide/set-operations.html.markdown.erb b/site/source/docs/datafu/guide/set-operations.html.markdown.erb
index 1b2042c..d14c07e 100644
--- a/site/source/docs/datafu/guide/set-operations.html.markdown.erb
+++ b/site/source/docs/datafu/guide/set-operations.html.markdown.erb
@@ -1,6 +1,6 @@
---
title: Set Operations - Guide - Apache DataFu Pig
-version: 1.3.3
+version: 1.4.0
section_name: Apache DataFu Pig - Guide
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/site/source/docs/datafu/guide/statistics.html.markdown.erb b/site/source/docs/datafu/guide/statistics.html.markdown.erb
index a608ff3..0e24b3e 100644
--- a/site/source/docs/datafu/guide/statistics.html.markdown.erb
+++ b/site/source/docs/datafu/guide/statistics.html.markdown.erb
@@ -1,6 +1,6 @@
---
title: Statistics - Guide - Apache DataFu Pig
-version: 1.3.3
+version: 1.4.0
section_name: Apache DataFu Pig - Guide
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/site/source/docs/download.html.markdown.erb b/site/source/docs/download.html.markdown.erb
index bfe7160..2b01a88 100644
--- a/site/source/docs/download.html.markdown.erb
+++ b/site/source/docs/download.html.markdown.erb
@@ -1,7 +1,7 @@
---
title: Download - Apache DataFu
section_name: Getting Started
-version: 1.3.3
+version: 1.4.0
license: >
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -27,37 +27,38 @@
The latest source release can be found here:
-* <%= current_source_release_link("1.3.3") %>
+* <%= current_source_release_link("1.4.0") %>
Previous releases:
+* <%= archived_incubator_source_release_link("1.3.3") %>
* [apache-datafu-incubating-sources-1.3.2.tgz](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.2/apache-datafu-incubating-sources-1.3.2.tgz) [ [PGP](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.2/apache-datafu-incubating-sources-1.3.2.tgz.asc) ] [ [MD5](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.2/apache-datafu-incubating-sources-1.3.2.tgz.MD5) ] [ [SHA512](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.2/apache-datafu-incubating-sources-1.3.2.tgz.SHA-512) ]
* [apache-datafu-incubating-sources-1.3.1.tgz](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.1/apache-datafu-incubating-sources-1.3.1.tgz) [ [PGP](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.1/apache-datafu-incubating-sources-1.3.1.tgz.asc) ] [ [MD5](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.1/apache-datafu-incubating-sources-1.3.1.tgz.MD5) ] [ [SHA512](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.1/apache-datafu-incubating-sources-1.3.1.tgz.SHA-512) ]
* [apache-datafu-incubating-sources-1.3.0.tgz](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.0/apache-datafu-incubating-sources-1.3.0.tgz) [ [PGP](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.0/apache-datafu-incubating-sources-1.3.0.tgz.asc) ] [ [MD5](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.0/apache-datafu-incubating-sources-1.3.0.tgz.MD5) ]
### Validation
-It is important to validate the release using either the PGP signature (`.asc` file) or hashes (`.md5` or `.sha512` files). For more information on verification of Apache releases, see [here](https://www.apache.org/info/verification.html). The `KEYS` file can be found [here](https://www.apache.org/dist/incubator/datafu/KEYS).
+It is important to validate the release using either the PGP signature (`.asc` file) or hashes (`.md5` or `.sha512` files). For more information on verification of Apache releases, see [here](https://www.apache.org/info/verification.html). The `KEYS` file can be found [here](https://www.apache.org/dist/datafu/KEYS).
Once fetched, the `KEYS` file can be imported and the `.asc` file can used to verify the release.
```
gpg --import KEYS
-gpg --verify apache-datafu-incubating-sources-<%= current_page.data.version %>.tgz.asc apache-datafu-incubating-sources-<%= current_page.data.version %>.tgz
+gpg --verify apache-datafu-sources-<%= current_page.data.version %>.tgz.asc apache-datafu-sources-<%= current_page.data.version %>.tgz
```
The `md5sum` tool can be used to compute an MD5 hash that can be compared against the `.md5` file:
```
-md5sum apache-datafu-incubating-sources-<%= current_page.data.version %>.tgz
-cat apache-datafu-incubating-sources-<%= current_page.data.version %>.tgz.md5
+md5sum apache-datafu-sources-<%= current_page.data.version %>.tgz
+cat apache-datafu-sources-<%= current_page.data.version %>.tgz.md5
```
The `sha512sum` tool can be used to compute a SHA-512 hash that can be compared against the `.sha512` file:
```
-sha512sum apache-datafu-incubating-sources-<%= current_page.data.version %>.tgz
-cat apache-datafu-incubating-sources-<%= current_page.data.version %>.tgz.md5
+sha512sum apache-datafu-sources-<%= current_page.data.version %>.tgz
+cat apache-datafu-sources-<%= current_page.data.version %>.tgz.md5
```
Note that the hashes are only intended to check that the file has been downloaded correctly. They do not provide guarantees on the authenticity of the file. The signature should instead be used for this purpose. For more information see [here](https://www.apache.org/info/verification.html).
@@ -66,8 +67,8 @@
Make sure you have [Gradle](http://gradle.org/gradle-download/) installed. Extract the source and bootstrap the `gradlew` script that's used for building. The `gradlew` script uses the specific version of Gradle that DataFu is intended to be built with.
- tar xvf apache-datafu-incubating-sources-<%= current_page.data.version %>.tgz
- cd apache-datafu-incubating-sources-<%= current_page.data.version %>
+ tar xvf apache-datafu-sources-<%= current_page.data.version %>.tgz
+ cd apache-datafu-sources-<%= current_page.data.version %>
gradle -b bootstrap.gradle
To build the JARs, run:
@@ -91,23 +92,23 @@
The latest release can be found in [Apache's Maven Repository for DataFu](https://repository.apache.org/content/groups/public/org/apache/datafu):
-* [datafu-pig-incubating-<%= current_page.data.version %>](https://repository.apache.org/content/groups/public/org/apache/datafu/datafu-pig-incubating/<%= current_page.data.version %>/)
-* [datafu-hourglass-incubating-<%= current_page.data.version %>](https://repository.apache.org/content/groups/public/org/apache/datafu/datafu-hourglass-incubating/<%= current_page.data.version %>/)
+* [datafu-pig-<%= current_page.data.version %>](https://repository.apache.org/content/groups/public/org/apache/datafu/datafu-pig/<%= current_page.data.version %>/)
+* [datafu-hourglass-<%= current_page.data.version %>](https://repository.apache.org/content/groups/public/org/apache/datafu/datafu-hourglass/<%= current_page.data.version %>/)
You can also use a dependency management system to download the DataFu artifacts and all their dependencies.
Gradle:
```groovy
-compile "org.apache.datafu:datafu-pig-incubating:<%= current_page.data.version %>"
-compile "org.apache.datafu:datafu-hourglass-incubating:<%= current_page.data.version %>"
+compile "org.apache.datafu:datafu-pig:<%= current_page.data.version %>"
+compile "org.apache.datafu:datafu-hourglass:<%= current_page.data.version %>"
```
Ivy:
```xml
-<dependency org="org.apache.datafu" name="datafu-pig-incubating" rev="<%= current_page.data.version %>"/>
-<dependency org="org.apache.datafu" name="datafu-hourglass-incubating" rev="<%= current_page.data.version %>"/>
+<dependency org="org.apache.datafu" name="datafu-pig" rev="<%= current_page.data.version %>"/>
+<dependency org="org.apache.datafu" name="datafu-hourglass" rev="<%= current_page.data.version %>"/>
```
Maven:
@@ -115,12 +116,12 @@
```xml
<dependency>
<groupId>org.apache.datafu</groupId>
- <artifactId>datafu-pig-incubating</artifactId>
+ <artifactId>datafu-pig</artifactId>
<version><%= current_page.data.version %></version>
</dependency>
<dependency>
<groupId>org.apache.datafu</groupId>
- <artifactId>datafu-hourglass-incubating</artifactId>
+ <artifactId>datafu-hourglass</artifactId>
<version><%= current_page.data.version %></version>
</dependency>
```
diff --git a/site/source/docs/hourglass/getting-started.html.markdown.erb b/site/source/docs/hourglass/getting-started.html.markdown.erb
index 0c03c0b..cb8d51e 100644
--- a/site/source/docs/hourglass/getting-started.html.markdown.erb
+++ b/site/source/docs/hourglass/getting-started.html.markdown.erb
@@ -64,7 +64,7 @@
Let's define some shorthand commands to run the Hourglass JAR and dump JSON from an Avro file:
- export HOURGLASS_CMD="hadoop jar datafu-hourglass/build/libs/datafu-hourglass-incubating-<%= current_page.data.version %>-tests.jar datafu.hourglass.demo.Main"
+ export HOURGLASS_CMD="hadoop jar datafu-hourglass/build/libs/datafu-hourglass-<%= current_page.data.version %>-tests.jar datafu.hourglass.demo.Main"
export TO_JSON_CMD="java -jar datafu-hourglass/build/demo_dependencies/avro-tools-1.7.4.jar tojson"
diff --git a/site/source/layouts/_docs_nav.erb b/site/source/layouts/_docs_nav.erb
index 2ec917d..35b7d8a 100644
--- a/site/source/layouts/_docs_nav.erb
+++ b/site/source/layouts/_docs_nav.erb
@@ -28,14 +28,14 @@
<ul class="nav nav-pills nav-stacked">
<li><a href="/docs/datafu/guide.html">Guide</a></li>
- <li><a href="https://datafu.incubator.apache.org/docs/datafu/1.3.3/">Javadocs</a></li>
+ <li><a href="https://datafu.apache.org/docs/datafu/1.4.0/">Javadocs</a></li>
</ul>
<h4>DataFu Hourglass Docs</h4>
<ul class="nav nav-pills nav-stacked">
<li><a href="/docs/hourglass/concepts.html">Concepts</a></li>
- <li><a href="https://datafu.incubator.apache.org/docs/hourglass/1.3.3/">Javadocs</a></li>
+ <li><a href="https://datafu.apache.org/docs/hourglass/1.4.0/">Javadocs</a></li>
</ul>
<h4>Community</h4>
diff --git a/site/source/layouts/blog.erb b/site/source/layouts/blog.erb
index c93c462..98a2375 100644
--- a/site/source/layouts/blog.erb
+++ b/site/source/layouts/blog.erb
@@ -22,7 +22,7 @@
<meta name="twitter:site" content="@apachedatafu" />
<meta name="twitter:title" content="<%= current_article.title %>" />
<meta name="twitter:description" content="<%= inner_text current_article.summary %>" />
- <meta property="og:url" content="http://datafu.incubator.apache.org<%= current_page.url %>" />
+ <meta property="og:url" content="http://datafu.apache.org<%= current_page.url %>" />
<meta property="og:type" content="article" />
<meta property="og:title" content="<%= current_article.title %>" />
<meta property="og:description" content="<%= inner_text current_article.summary %>" />
diff --git a/site/source/sitemap.xml.builder b/site/source/sitemap.xml.builder
index cfd6c50..a311d7d 100644
--- a/site/source/sitemap.xml.builder
+++ b/site/source/sitemap.xml.builder
@@ -23,7 +23,7 @@
xml.urlset 'xmlns' => "http://www.sitemaps.org/schemas/sitemap/0.9" do
sitemap.resources.select { |page| page.destination_path =~ /\.html/ }.each do |page|
xml.url do
- xml.loc "http://datafu.incubator.apache.org/#{page.destination_path}"
+ xml.loc "http://datafu.apache.org/#{page.destination_path}"
xml.lastmod Date.today.to_time.iso8601
xml.changefreq page.data.changefreq || "monthly"
xml.priority page.data.priority || "0.5"
