Skip to content

Commit de00888

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 865bed5 + 37d5dc2 commit de00888

File tree

2,960 files changed

+93300
-77066
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,960 files changed

+93300
-77066
lines changed

.gitattributes

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Files and directories with the attribute export-ignore won’t be added to
2+
# archive files. See http://git-scm.com/docs/gitattributes for details.
3+
/.gitattributes export-ignore
4+
/website/ export-ignore

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,9 @@ website/public/
132132

133133
# Visual Studio Code
134134
.vscode
135+
136+
# integration_test
137+
results/
138+
139+
# Vagrant
140+
vagrant/.vagrant/

.htaccess

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Redirect /index.html https://apache.github.io/incubator-heron/
2+

.rat-excludes

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Files start with .
2+
\..*
3+
4+
# Data/doc files
5+
.*\.conf
6+
.*\.json
7+
.*\.md
8+
.*\.txt
9+
.*\.BUILD
10+
.*\.patch
11+
12+
_helpers\.tpl
13+
autogen\.sh
14+
description
15+
heron\.iml
16+
17+
# UI resources
18+
jquery.*\.js
19+
bootstrap\.min\.css
20+
glyphicons-halflings-regular\.svg
21+
bootstrap\.min\.js
22+
d3.*\.js
23+
html5-trunk\.js
24+
list\.min.*.js
25+
moment\.min.*\.js
26+
underscore-min.*\.js
27+
underscore-min.*\.map
28+
29+
# Directories
30+
bazel-.*
31+
m4
32+
website
33+
META-INF
34+
35+
# Thirdparty
36+
cpplint\.py
37+
kashmir
38+
semver

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ env:
2828

2929
before_install:
3030
# download and install bazel
31-
- wget -q 'https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh'
32-
- chmod +x bazel-0.9.0-installer-linux-x86_64.sh
33-
- ./bazel-0.9.0-installer-linux-x86_64.sh --user
31+
- wget -q 'https://github.com/bazelbuild/bazel/releases/download/0.14.1/bazel-0.14.1-installer-linux-x86_64.sh'
32+
- chmod +x bazel-0.14.1-installer-linux-x86_64.sh
33+
- ./bazel-0.14.1-installer-linux-x86_64.sh --user
3434

3535
before_script:
3636
# install python module for wheel files

ADOPTERS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Heron Adopters
22

3-
Twitter isn't the only company using Heron. We're sure the following list isn't complete, so please [let us know](https://github.com/twitter/heron) if your company should be included, or if you'd like us to feature a link to a blog post or article about how you're using Heron. Or even better, add the links yourself (please use HTTPS URLs if possible) and [submit a pull request](https://github.com/twitter/heron)!
3+
Twitter isn't the only company using Heron. We're sure the following list isn't complete, so please [let us know](https://github.com/apache/incubator-heron) if your company should be included, or if you'd like us to feature a link to a blog post or article about how you're using Heron. Or even better, add the links yourself (please use HTTPS URLs if possible) and [submit a pull request](https://github.com/apache/incubator-heron)!
44

55
* [Twitter](https://twitter.com/)
66
* https://blog.twitter.com/2016/open-sourcing-twitter-heron

DISCLAIMER

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Apache Heron (incubating) is an effort undergoing incubation at The Apache Software Foundation
2+
(ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted
3+
projects until a further review indicates that the infrastructure, communications, and decision
4+
making process have stabilized in a manner consistent with other successful ASF projects. While
5+
incubation status is not necessarily a reflection of the completeness or stability of the code,
6+
it does indicate that the project has yet to be fully endorsed by the ASF.

LICENSE

+101
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,104 @@
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201201
limitations under the License.
202+
203+
204+
============================================================================
205+
APACHE HERON SUBCOMPONENTS:
206+
207+
The Apache Heron project contains subcomponents with separate copyright
208+
notices and license terms. Your use of the source code for the these
209+
subcomponents is subject to the terms and conditions of the following
210+
licenses.
211+
212+
========================================================================
213+
Third party Apache 2.0 licenses
214+
========================================================================
215+
216+
The following components are provided under the Apache 2.0 License.
217+
See project link for details.
218+
219+
Bootstrap(v2.0.3, https://github.com/twbs/bootstrap/blob/v2.0.3/LICENSE)
220+
-> heron/shell/assets/bootstrap.css
221+
Bootstrap(v2.2.2, https://github.com/twbs/bootstrap/blob/v2.2.2/LICENSE)
222+
-> heron/tools/ui/resources/static/js/bootstrap.js
223+
Bootstrap(v3.0.0, https://github.com/twbs/bootstrap/blob/v3.0.0/LICENSE)
224+
-> heron/tools/ui/resources/static/css/bootstrap.css
225+
JQuery(https://jquery.org/license/)
226+
-> heron/shell/assets/jquery.js
227+
-> heron/tools/ui/resources/static/js/jquery.min.js
228+
JSXTransformer(v0.10.0)
229+
-> heron/tools/ui/resources/static/js/JSXTransformer.0.10.0.js
230+
React (v0.10.0, https://github.com/facebook/react/blob/0.10-stable/LICENSE)
231+
-> heron/tools/ui/resources/static/js/react.0.10.0.js
232+
bazel_jar_jar(https://github.com/johnynek/bazel_jar_jar/blob/master/LICENSE)
233+
-> tools/rules/jarjar_rules.bzl
234+
gerrit(https://gerrit.googlesource.com/gerrit/+/master/COPYING)
235+
-> tools/rules/javadoc.bzl
236+
heronpy(Copyright - Parsely, Inc.)
237+
-> heronpy/api/bolt/base_bolt.py
238+
-> heronpy/api/bolt/bolt.py
239+
-> heronpy/api/bolt/base_component.py
240+
-> heronpy/api/bolt/base_spout.py
241+
-> heronpy/api/bolt/stream.py
242+
-> heronpy/api/bolt/generator.py
243+
-> heronpy/api/bolt/transformoperator.py
244+
k8s-zookeeper-docker(https://github.com/muxinc/k8s-zookeeper-docker/blob/master/LICENSE)
245+
-> docker/base/scripts/generate-zookeeper-config.sh
246+
247+
========================================================================
248+
Third party MIT licenses
249+
========================================================================
250+
251+
The following components are provided under the MIT License. See project link for details.
252+
253+
Bootstrap(v3.1.1, https://github.com/twbs/bootstrap/blob/v3.1.1/LICENSE)
254+
-> heron/tools/ui/resources/static/js/bootstrap.min.js
255+
-> heron/tools/ui/resources/static/css/bootstrap.min.css
256+
-> heron/tools/ui/resources/static/fonts/glyphicons-halflings-regular.{eot, svg, ttf, woff}
257+
JSXTransformer(v0.10.0, https://github.com/cronn-de/jsxtransformer/blob/master/LICENSE)
258+
-> heron/tools/ui/resources/static/js/JSXTransformer.0.10.0.js
259+
Underscore.js(v1.6.0, https://github.com/jashkenas/underscore/blob/master/LICENSE)
260+
-> heron/tools/ui/resources/static/js/underscore-min.1.6.0.js
261+
-> heron/tools/ui/resources/static/js/underscore-min.map
262+
d3-tip(v0.6.3, https://github.com/Caged/d3-tip/blob/master/LICENSE)
263+
-> heron/tools/ui/resources/static/js/d3-tip.min.0.6.3.js
264+
html5shiv(v3.6.2pre, https://github.com/aFarkas/html5shiv/blob/master/MIT%20and%20GPL2%20licenses.md)
265+
-> heron/tools/ui/resources/static/js/html5-trunk.js
266+
jQuery UI(v1.8.23, https://github.com/jquery/jquery-ui/blob/master/LICENSE.txt)
267+
-> heron/tools/ui/resources/static/js/jquery-ui-1.8.23.custom.min.js
268+
list.js(v1.1.1, https://github.com/javve/list.js/blob/master/LICENSE)
269+
-> heron/tools/ui/resources/static/js/list.min.1.1.1.js
270+
moment(v2.8.3, https://github.com/moment/moment/blob/develop/LICENSE)
271+
-> heron/tools/ui/resources/static/js/moment.min.2.8.3.js
272+
normalize.css(v2.1.0, v3.0.1, https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
273+
-> heron/tools/ui/resources/static/css/bootstrap.css
274+
-> heron/tools/ui/resources/static/css/bootstrap.min.css
275+
276+
========================================================================
277+
Third party BSD 3-Clause licenses
278+
========================================================================
279+
280+
The following components are provided under the BSD 3-Clause license.
281+
See project link for details.
282+
283+
JSXTransformer(v0.10.0)
284+
-> heron/tools/ui/resources/static/js/JSXTransformer.0.10.0.js
285+
autogen.sh
286+
-> config/autogen.sh
287+
cloudpickle(https://github.com/cloudpipe/cloudpickle/blob/master/LICENSE)
288+
-> heronpy/api/cloudpickle.py
289+
cpplint(https://github.com/cpplint/cpplint/blob/master/LICENSE)
290+
-> third_party/python/cpplint/cpplint.py
291+
d3(v3.4.11, https://github.com/d3/d3/blob/master/LICENSE)
292+
-> heron/tools/ui/resources/static/js/d3.min.3.4.11.js
293+
294+
========================================================================
295+
Third party Boost Software License, Version 1.0 licenses
296+
========================================================================
297+
298+
The following components are provided under the Boost Software License, Version 1.0.
299+
See project link for details.
300+
301+
kashmir(https://github.com/Corvusoft/kashmir-dependency/blob/master/LICENSE_1_0.txt)
302+
-> third_party/kashmir/*

NOTICE

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Apache Storm
2-
Copyright 2015 The Apache Software Foundation
1+
Apache Heron
2+
Copyright 2018 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).
66

7-
This product includes software developed by Yahoo! Inc. (www.yahoo.com)
8-
Copyright (c) 2012-2015 Yahoo! Inc.
7+
This product includes software developed by Twitter Inc. (www.twitter.com)
8+
Copyright (c) 2014-2018 Twitter Inc.

README.md

+16-27
Original file line numberDiff line numberDiff line change
@@ -2,59 +2,48 @@
22

33
![logo](website/static/img/HeronTextLogo.png)
44

5-
Heron is realtime analytics platform developed by Twitter. It is the direct
6-
successor of [Apache Storm](http://storm.apache.org), built to be backwards
7-
compatible with Storm's [topology API](http://storm.apache.org/releases/current/Tutorial.html#topologies)
8-
but with a wide array of architectural improvements.
5+
Heron is realtime analytics platform developed by Twitter. It has a wide array of architectural improvements over it's predecessor.
96

10-
http://incubator.apache.org/projects/heron.html
7+
[Heron in Apache Incubation](http://incubator.apache.org/projects/heron.html)
118

12-
https://heron.incubator.apache.org (coming soon...)
9+
[Heron Website](https://apache.github.io/incubator-heron)
1310

1411
### Documentation
15-
http://heronstreaming.io (official until)
12+
13+
[https://apache.github.io/incubator-heron](https://apache.github.io/incubator-heron)
1614

1715
#### Heron Requirements:
1816
* Java JDK 1.8
1917
* Python 2.7
20-
* Bazel
21-
18+
* Bazel latest
2219

2320
## Contact
2421

2522
#### Mailing lists
2623

27-
Heron User Google Group: [[email protected]](https://groups.google.com/forum/#!forum/heron-users)
28-
29-
Heron on Twitter: [@heronstreaming](https://twitter.com/heronstreaming)
30-
31-
3224
| Name | Scope | | | |
3325
|:--------------------------------------------------------------------------|:--------------------------------|:---------------------------------------------------------------|:-------------------------------------------------------------------|:--------------------------------------------------------------------------|
3426
| [[email protected]](mailto:[email protected]) | User-related discussions | [Subscribe](mailto:[email protected]) | [Unsubscribe](mailto:[email protected]) | [Archives](http://mail-archives.apache.org/mod_mbox/incubator-heron-user/)|
3527
| [[email protected]](mailto:[email protected]) | Development-related discussions | [Subscribe](mailto:[email protected]) | [Unsubscribe](mailto:[email protected]) | [Archives](http://mail-archives.apache.org/mod_mbox/incubator-heron-dev/) |
3628

3729
#### Slack
3830

39-
heron slack channel at https://heronstreaming.slack.com/
40-
41-
You can self-register at http://heronstreaming.herokuapp.com/
31+
[Self-Register](http://heronstreaming.herokuapp.com/) to our [Heron Slack Workspace](https://heronstreaming.slack.com/)
4232

4333
#### Meetup Group
44-
https://www.meetup.com/Apache-Heron-Bay-Area
4534

35+
[Bay Area Heron Meetup](https://www.meetup.com/Apache-Heron-Bay-Area), *We meet on Third Monday of Every Month in Palo Alto.*
36+
37+
#### Twitter
38+
Heron on Twitter: [@heronstreaming](https://twitter.com/heronstreaming)
4639

4740
## For more information:
4841

49-
* Official Heron documentation located at [heronstreaming.io](http://heronstreaming.io)
50-
* Official Heron resources, including Conference & Journal Papers, Videos, Blog Posts and selected Press located at [Heron Resources](http://twitter.github.io/heron/docs/resources/)
51-
* [Twitter Heron: Stream Processing at
52-
Scale](http://dl.acm.org/citation.cfm?id=2742788) (academic paper)
53-
* [Twitter Heron: Stream Processing at
54-
Scale](https://www.youtube.com/watch?v=pUaFOuGgmco) (YouTube video)
55-
* [Flying Faster with Twitter
56-
Heron](https://blog.twitter.com/2015/flying-faster-with-twitter-heron) (blog
57-
post)
42+
* Official Heron documentation located at [https://apache.github.io/incubator-heron](https://apache.github.io/incubator-heron)
43+
* Official Heron resources, including Conference & Journal Papers, Videos, Blog Posts and selected Press located at [Heron Resources](https://apache.github.io/incubator-heron/docs/resources/)
44+
* [Twitter Heron: Stream Processing at Scale](http://dl.acm.org/citation.cfm?id=2742788) (academic paper)
45+
* [Twitter Heron: Stream Processing at Scale](https://www.youtube.com/watch?v=pUaFOuGgmco) (YouTube video)
46+
* [Flying Faster with Twitter Heron](https://blog.twitter.com/2015/flying-faster-with-twitter-heron) (blog post)
5847

5948
## Update
6049

0 commit comments

Comments
 (0)