Merge branches 'feature/fix-prometheus-metrics' and 'feature/fix-prometheus-metrics' of https://github.com/thinker0/heron into feature/fix-prometheus-metrics

* 'feature/fix-prometheus-metrics' of https://github.com/thinker0/heron:
  Remove unused
  Fix checkstyle
  Support jmx_exporter format configuration.
  wip
  Fix command arguments.
  Java 11 support (apache#3399)
  Update README for Java 11 (apache#3464)
  Update website for java 11 (apache#3462)
  Java 11 support (apache#3454)
  adding examples folder to classpath (apache#3458)
  removing symlink.  Adding contributing guidelines back (apache#3450)
  adding new committers (apache#3451)
  Bump mixin-deep from 1.3.1 to 1.3.2 in /website2/website (apache#3391)
  Add redirect from github pages to new apache site (apache#3448)
  remove old site (apache#3446)
  Use netcat-bsd in Debian (apache#3447)
  Added execute permission to dev-env-create.sh (apache#3443)

* 'feature/fix-prometheus-metrics' of https://github.com/thinker0/heron:
  Remove unused
  Fix checkstyle
  Support jmx_exporter format configuration.
  wip
  Fix command arguments.
  Java 11 support (apache#3399)
  Update README for Java 11 (apache#3464)
  Update website for java 11 (apache#3462)
  Java 11 support (apache#3454)
  adding examples folder to classpath (apache#3458)
  removing symlink.  Adding contributing guidelines back (apache#3450)
  adding new committers (apache#3451)
  Bump mixin-deep from 1.3.1 to 1.3.2 in /website2/website (apache#3391)
  Add redirect from github pages to new apache site (apache#3448)
  remove old site (apache#3446)
  Use netcat-bsd in Debian (apache#3447)
  Added execute permission to dev-env-create.sh (apache#3443)

# Conflicts:
#	.travis.yml

Author: thinker0

.asf.yaml

@@ -21,10 +21,11 @@ staging:
 
 publish:
   whoami: asf-site
-  hostname: http://heronstreaming.io
 
 github:
   description: "Apache Heron (Incubating) is a realtime, distributed, fault-tolerant stream processing engine from Twitter"
+  ghp_branch:  master
+  ghp_path: ~
   homepage: https://heron.incubator.apache.org/
   labels:
     - heron

.travis.yml

@@ -7,7 +7,7 @@ dist: trusty
 language: java
 
 jdk:
-  - oraclejdk11 
+  - oraclejdk11
 
 addons:
   apt:

CONTRIBUTING.md

@@ -0,0 +1,74 @@
+<!--
+    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.
+-->
+
+## Contributing to Heron
+
+Discussion about Heron happens on GitHub and over the mailing list.
+
+* GitHub: [apache/incubator-heron](https://github.com/apache/incubator-heron)
+* Heron User Group: [[email protected]](https://mail-archives.apache.org/mod_mbox/heron-user/)
+
+Community is critical to Heron. Contributions are welcomed!
+
+
+## How Can I Contribute to Heron?
+
+You can first read the following pages to have a basic understanding
+of Heron:
+
+* [Heron Architecture](https://heron.incubator.apache.org/docs/heron-architecture/)
+* [Compiling Heron](https://heron.incubator.apache.org/docs/compiling-overview/)
+* [Heron Codebase](https://heron.incubator.apache.org/docs/compiling-code-organization/)
+
+Heron includes a script to bootstrap an IntelliJ IDEA project. The project includes support for Heron
+code styles and copyright headers. 
+
+To bootstrap an IDEA project run the following from the root folder of the repo::
+
+```bash
+$ ./scripts/setup-intellij.sh
+```
+To bootstrap an Eclipse project fun the following from the root folder of the repo:
+
+```bash
+$ ./scripts/setup-eclipse.sh
+```
+
+In general, contributions that fix bugs or add features (as opposed to stylistic, refactoring, or
+"cleanup" changes) are preferred. If you're looking for places to contribute, issues with label
+[help-wanted](https://github.com/apache/incubator-heron/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)
+are good candidates. Please check with the [mailing list](https://mail-archives.apache.org/mod_mbox/heron-dev/)
+if your patch involves lots of changes.
+
+**If you have any question or issues about troubleshooting**,
+you should post on [mailing list](https://mail-archives.apache.org/mod_mbox/heron-user/) instead
+of opening GitHub issues.
+
+### Submitting a Patch
+1. Discuss your plan and design, and get agreement on
+[mailing list](https://mail-archives.apache.org/mod_mbox/heron-dev/).
+
+2. Implement proper unit tests along with your change. Verify that all tests can pass.
+
+3. Submit a GitHub pull request that includes your change and test cases.
+Describe clearly in your pull request the changes made. Verify that Travis CI passes.
+
+4. Complete a code review by addressing the reviewer's comments.
+
+5. A project committer will merge the patch to the master branch.

CONTRIBUTING.md

@@ -29,7 +29,7 @@ Heron is realtime analytics platform developed by Twitter.  It has a wide array
 [https://heron.incubator.apache.org/](https://heron.incubator.apache.org/)
 
 #### Heron Requirements:
- * Java JDK 1.8
+ * Java 11
  * Python 3
  * Bazel 0.26.0
 

README.md

@@ -18,7 +18,7 @@
 FROM openjdk:8-jdk-slim
 
 RUN apt-get -y update && apt-get -y install \
-    netcat \
+    netcat-openbsd \
     python \
     unzip \
     curl \

docker/base/Dockerfile.base.debian9

@@ -35,18 +35,18 @@ RUN yum -y install \
       libtool \
       make \
       patch \
-      python \
       python-devel \
-      python-setuptools \
+      python3-devel \
+      python3-setuptools \
       zip \
       unzip \
       wget \
       which \
       tree \
-      java-1.8.0-openjdk \
-      java-1.8.0-openjdk-devel
+      java-11-openjdk \
+      java-11-openjdk-devel
 
-ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
 
 RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \
       && chmod +x /tmp/bazel.sh \

docker/compile/Dockerfile.centos7

@@ -30,14 +30,17 @@ RUN apt-get update && apt-get -y install \
       git \
       libtool \
       libtool-bin \
-      python \
-      python2.7-dev \
+      python-dev \
+      python3-dev \
       software-properties-common \
-      python-setuptools \
+      python3-setuptools \
       tree \
       zip \
       unzip \
-      wget
+      wget \
+      openjdk-11-jdk-headless
+
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 
 RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \
       && chmod +x /tmp/bazel.sh \

docker/compile/Dockerfile.debian9

@@ -33,18 +33,18 @@ RUN apt-get update && apt-get -y install \
       libssl-dev \
       git \
       libtool \
-      python \
-      python2.7-dev \
-      python-software-properties \
-      python-setuptools \
+      python-dev \
+      python3-dev \
+      python3-software-properties \
+      python3-setuptools \
       zip \
       unzip \
       wget \
       cmake \
       tree \
-      openjdk-8-jdk-headless
+      openjdk-11-jdk-headless
 
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 
 RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \
       && chmod +x /tmp/bazel.sh \

docker/compile/Dockerfile.ubuntu14.04

@@ -31,19 +31,18 @@ RUN apt-get update && apt-get -y install \
       libtool-bin \
       libunwind8 \
       libunwind-setjmp0-dev \
-      python \
-      python2.7-dev \
-      python-software-properties \
+      python-dev \
+      python3-dev \
+      python3-software-properties \
       software-properties-common \
-      python-setuptools \
+      python3-setuptools \
       tree \
       zip \
       unzip \
-      wget
+      wget \
+      openjdk-11-jdk-headless
 
-RUN apt-get update && apt-get -y install openjdk-8-jdk-headless
-
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 
 RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \
       && chmod +x /tmp/bazel.sh \

docker/compile/Dockerfile.ubuntu16.04

@@ -29,16 +29,17 @@ RUN apt-get update && apt-get -y install \
       libunwind8 \
       patch \
       python-dev \
+      python3-dev \
       wget \
       zip \
       virtualenv \
       unzip \
       git \
       curl \
       tree \
-      openjdk-8-jdk-headless
+      openjdk-11-jdk-headless
 
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 
 RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \
       && chmod +x /tmp/bazel.sh \

docker/compile/Dockerfile.ubuntu18.04

@@ -23,13 +23,13 @@ RUN yum -y install unzip; yum clean all
 RUN yum -y install which; yum clean all
 RUN yum -y install curl; yum clean all
 RUN yum -y install nmap-ncat; yum clean all
-RUN yum -y install python-setuptools; yum clean all
+RUN yum -y install python python3-setuptools; yum clean all
 RUN easy_install supervisor
 RUN echo_supervisord_conf > /etc/supervisord.conf
 
-RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel; yum clean all
+RUN yum -y install java-11-openjdk java-11-openjdk-devel; yum clean all
 
-ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
 
 ADD artifacts /heron
 

docker/dist/Dockerfile.dist.centos7

@@ -18,12 +18,14 @@
 FROM openjdk:8-jdk-slim
 
 RUN apt-get -y update && apt-get -y install \
-    netcat \
+    netcat-openbsd \
     python \
+    python3 \
     unzip \
     curl \
     vim \
-    supervisor && \
+    supervisor \
+    openjdk-11-jdk-headless && \
     apt-get clean all && \
     rm -rf /var/lib/apt/lists/*
 

docker/dist/Dockerfile.dist.debian9

@@ -19,15 +19,16 @@ FROM ubuntu:14.04
 
 RUN apt-get -y update && apt-get -y install \
     python \
+    python3 \
     unzip \
     software-properties-common \
     supervisor \
     curl
 
 RUN add-apt-repository ppa:openjdk-r/ppa && apt-get -y update && \
-    apt-get -y install openjdk-8-jdk
+    apt-get -y install openjdk-11-jdk-headless
 
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 RUN update-ca-certificates -f
 
 ADD artifacts /heron

docker/dist/Dockerfile.dist.ubuntu14.04

@@ -21,13 +21,14 @@ RUN apt-get update
 
 RUN apt-get -y install \
     python \
+    python3 \
     unzip \
     software-properties-common \
     curl \
     supervisor \
-    openjdk-8-jdk-headless
+    openjdk-11-jdk-headless
 
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 RUN update-ca-certificates -f
 
 ADD artifacts /heron

docker/dist/Dockerfile.dist.ubuntu16.04

@@ -19,9 +19,9 @@ FROM ubuntu:18.04
 
 RUN apt-get update
 RUN apt-get -y install \
-    unzip software-properties-common curl supervisor openjdk-8-jdk-headless
+    unzip software-properties-common curl python python3 supervisor openjdk-11-jdk-headless
 
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 RUN update-ca-certificates -f
 
 ADD artifacts /heron

docker/dist/Dockerfile.dist.ubuntu18.04

@@ -0,0 +1,64 @@
+#!/bin/bash
+# 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.
+set -o nounset
+set -o errexit
+
+realpath() {
+  echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
+}
+
+DOCKER_DIR=$(dirname $(dirname $(realpath $0)))
+PROJECT_DIR=$(dirname $DOCKER_DIR)
+
+verify_dockerfile_exists() {
+  if [ ! -f $1 ]; then
+    echo "The Dockerfiler $1 does not exist"
+    exit 1
+  fi
+}
+
+dockerfile_path_for_platform() {
+  echo "$SCRATCH_DIR/test/Dockerfile.$1"
+}
+
+copy_bazel_rc_to() {
+  cp $PROJECT_DIR/tools/docker/bazel.rc $1
+}
+
+DOCKER_FILE=$(dockerfile_path_for_platform $TARGET_PLATFORM)
+verify_dockerfile_exists $DOCKER_FILE
+copy_bazel_rc_to  $SCRATCH_DIR/bazelrc
+
+echo "Building heron-compiler container"
+docker build -t heron-compiler:$TARGET_PLATFORM -f $DOCKER_FILE $SCRATCH_DIR
+
+echo "Running build in container"
+docker run \
+    --rm \
+    -e TARGET_PLATFORM=$TARGET_PLATFORM \
+    -e SCRATCH_DIR="/scratch" \
+    -e SOURCE_TARBALL="/src.tar.gz" \
+    -e HERON_VERSION=$HERON_VERSION \
+    -e HERON_GIT_REV="${HERON_GIT_REV}" \
+    -e HERON_BUILD_VERSION="${HERON_BUILD_VERSION}" \
+    -e HERON_BUILD_HOST="${HERON_BUILD_HOST}" \
+    -e HERON_BUILD_USER="${HERON_BUILD_USER}" \
+    -e HERON_BUILD_TIME="${HERON_BUILD_TIME}" \
+    -e HERON_TREE_STATUS="${HERON_TREE_STATUS}" \
+    -v "$SOURCE_TARBALL:/src.tar.gz:ro" \
+    -t heron-compiler:$TARGET_PLATFORM /test-platform.sh