You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by nl...@apache.org on 2018/05/02 19:52:38 UTC

[incubator-heron] branch master updated: Update license text in java files (#2881)

This is an automated email from the ASF dual-hosted git repository.

nlu90 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/master by this push:
     new 0138b8d  Update license text in java files (#2881)
0138b8d is described below

commit 0138b8d451c988f53e431f951f9a6fb9f2f4c116
Author: Ning Wang <nw...@twitter.com>
AuthorDate: Wed May 2 12:52:34 2018 -0700

    Update license text in java files (#2881)
    
    * Update license text in java files
    
    * more files
    
    * Update java header check template
---
 .../apache/heron/examples/eco/EvenAndOddBolt.java  |  32 +++--
 .../org/apache/heron/examples/eco/LogInfoBolt.java |  32 +++--
 .../apache/heron/examples/eco/RandomString.java    |  32 +++--
 .../heron/examples/eco/StatefulConsumerBolt.java   |  32 +++--
 .../heron/examples/eco/StatefulNumberSpout.java    |  32 +++--
 .../heron/examples/eco/StatefulRandomIntSpout.java |  32 +++--
 .../heron/examples/eco/StatefulWindowSumBolt.java  |  32 +++--
 .../heron/examples/eco/TestFibonacciSpout.java     |  32 +++--
 .../heron/examples/eco/TestIBasicPrintBolt.java    |  32 +++--
 .../apache/heron/examples/eco/TestNameCounter.java |  32 +++--
 .../apache/heron/examples/eco/TestNameSpout.java   |  32 +++--
 .../apache/heron/examples/eco/TestPrintBolt.java   |  32 +++--
 .../heron/examples/eco/TestPropertyHolder.java     |  32 +++--
 .../org/apache/heron/examples/eco/TestUnits.java   |  32 +++--
 .../apache/heron/examples/eco/TestWindowBolt.java  |  32 +++--
 .../org/apache/heron/examples/eco/WordSpout.java   |  32 +++--
 .../apache/heron/examples/eco/EvenAndOddBolt.java  |  32 +++--
 .../org/apache/heron/examples/eco/LogInfoBolt.java |  32 +++--
 .../heron/examples/eco/TestFibonacciSpout.java     |  32 +++--
 .../heron/examples/eco/TestIBasicPrintBolt.java    |  32 +++--
 .../apache/heron/examples/eco/TestNameCounter.java |  32 +++--
 .../apache/heron/examples/eco/TestNameSpout.java   |  32 +++--
 .../apache/heron/examples/eco/TestPrintBolt.java   |  32 +++--
 .../heron/examples/eco/TestPropertyHolder.java     |  32 +++--
 .../org/apache/heron/examples/eco/TestUnits.java   |  32 +++--
 .../apache/heron/examples/eco/TestWindowBolt.java  |  32 +++--
 eco/src/java/org/apache/heron/eco/Eco.java         |  32 +++--
 .../org/apache/heron/eco/builder/BoltBuilder.java  |  32 +++--
 .../apache/heron/eco/builder/BuilderUtility.java   |  32 +++--
 .../apache/heron/eco/builder/ComponentBuilder.java |  32 +++--
 .../apache/heron/eco/builder/ConfigBuilder.java    |  32 +++--
 .../apache/heron/eco/builder/ObjectBuilder.java    |  32 +++--
 .../apache/heron/eco/builder/heron/EcoBuilder.java |  32 +++--
 .../heron/eco/builder/heron/SpoutBuilder.java      |  32 +++--
 .../heron/eco/builder/heron/StreamBuilder.java     |  32 +++--
 .../apache/heron/eco/builder/storm/EcoBuilder.java |  32 +++--
 .../heron/eco/builder/storm/SpoutBuilder.java      |  32 +++--
 .../heron/eco/builder/storm/StreamBuilder.java     |  32 +++--
 .../heron/eco/definition/BeanDefinition.java       |  32 +++--
 .../heron/eco/definition/BeanListReference.java    |  32 +++--
 .../apache/heron/eco/definition/BeanReference.java |  32 +++--
 .../heron/eco/definition/BoltDefinition.java       |  32 +++--
 .../heron/eco/definition/ComponentStream.java      |  32 +++--
 .../definition/ConfigurationMethodDefinition.java  |  32 +++--
 .../heron/eco/definition/EcoExecutionContext.java  |  32 +++--
 .../eco/definition/EcoTopologyDefinition.java      |  32 +++--
 .../heron/eco/definition/GroupingDefinition.java   |  32 +++--
 .../heron/eco/definition/ObjectDefinition.java     |  32 +++--
 .../heron/eco/definition/PropertyDefinition.java   |  32 +++--
 .../heron/eco/definition/SpoutDefinition.java      |  32 +++--
 .../heron/eco/definition/StreamDefinition.java     |  32 +++--
 .../org/apache/heron/eco/parser/EcoParser.java     |  32 +++--
 .../org/apache/heron/eco/submit/EcoSubmitter.java  |  32 +++--
 eco/tests/java/org/apache/heron/eco/EcoTest.java   |  32 +++--
 .../apache/heron/eco/builder/BoltBuilderTest.java  |  32 +++--
 .../heron/eco/builder/BuilderUtilityTest.java      |  32 +++--
 .../heron/eco/builder/ComponentBuilderTest.java    |  32 +++--
 .../heron/eco/builder/ConfigBuilderTest.java       |  32 +++--
 .../heron/eco/builder/ObjectBuilderTest.java       |  32 +++--
 .../eco/builder/heron/HeronEcoBuilderTest.java     |  32 +++--
 .../eco/builder/heron/HeronSpoutBuilderTest.java   |  32 +++--
 .../eco/builder/heron/HeronStreamBuilderTest.java  |  32 +++--
 .../eco/builder/storm/StormEcoBuilderTest.java     |  32 +++--
 .../eco/builder/storm/StormSpoutBuilderTest.java   |  32 +++--
 .../eco/builder/storm/StormStreamBuilderTest.java  |  32 +++--
 .../org/apache/heron/eco/parser/EcoParserTest.java | 139 +++------------------
 .../apache/heron/eco/submit/EcoSubmitterTest.java  |  32 +++--
 .../apache/heron/examples/api/AckingTopology.java  |  32 +++--
 .../examples/api/ComponentJVMOptionsTopology.java  |  32 +++--
 .../heron/examples/api/CustomGroupingTopology.java |  32 +++--
 .../heron/examples/api/ExampleResources.java       |  32 +++--
 .../heron/examples/api/ExclamationTopology.java    |  32 +++--
 .../api/MultiSpoutExclamationTopology.java         |  32 +++--
 .../examples/api/MultiStageAckingTopology.java     |  32 +++--
 .../examples/api/SentenceWordCountTopology.java    |  32 +++--
 .../heron/examples/api/SlidingWindowTopology.java  |  32 +++--
 .../api/StatefulSlidingWindowTopology.java         |  32 +++--
 .../examples/api/StatefulWordCountTopology.java    |  32 +++--
 .../heron/examples/api/TaskHookTopology.java       |  32 +++--
 .../examples/api/WindowedWordCountTopology.java    |  32 +++--
 .../heron/examples/api/WordCountTopology.java      |  32 +++--
 .../heron/examples/api/bolt/PrinterBolt.java       |  32 +++--
 .../examples/api/bolt/SlidingWindowSumBolt.java    |  32 +++--
 .../examples/api/spout/RandomIntegerSpout.java     |  32 +++--
 .../heron/examples/api/spout/TestWordSpout.java    |  32 +++--
 .../examples/streamlet/FilesystemSinkTopology.java |  32 +++--
 .../streamlet/FormattedOutputTopology.java         |  32 +++--
 .../streamlet/ImpressionsAndClicksTopology.java    |  32 +++--
 .../streamlet/IntegerProcessingTopology.java       |  32 +++--
 .../examples/streamlet/RepartitionTopology.java    |  32 +++--
 .../streamlet/SimplePulsarSourceTopology.java      |  32 +++--
 .../examples/streamlet/SmartWatchTopology.java     |  32 +++--
 .../examples/streamlet/StreamletCloneTopology.java |  32 +++--
 .../examples/streamlet/TransformsTopology.java     |  32 +++--
 .../streamlet/WindowedWordCountTopology.java       |  32 +++--
 .../examples/streamlet/WireRequestsTopology.java   |  32 +++--
 .../examples/streamlet/utils/StreamletUtils.java   |  32 +++--
 .../api/src/java/org/apache/heron/api/Config.java  |  28 ++---
 .../src/java/org/apache/heron/api/Constants.java   |  27 ++--
 .../java/org/apache/heron/api/HeronSubmitter.java  |  27 ++--
 .../java/org/apache/heron/api/HeronTopology.java   |  28 ++---
 heron/api/src/java/org/apache/heron/api/Pair.java  |  27 ++--
 .../org/apache/heron/api/bolt/BaseBasicBolt.java   |  28 ++---
 .../org/apache/heron/api/bolt/BaseRichBolt.java    |  28 ++---
 .../heron/api/bolt/BaseStatefulWindowedBolt.java   |  32 +++--
 .../apache/heron/api/bolt/BaseWindowedBolt.java    |  27 ++--
 .../apache/heron/api/bolt/BasicBoltExecutor.java   |  28 ++---
 .../heron/api/bolt/BasicOutputCollector.java       |  28 ++---
 .../java/org/apache/heron/api/bolt/IBasicBolt.java |  28 ++---
 .../heron/api/bolt/IBasicOutputCollector.java      |  28 ++---
 .../src/java/org/apache/heron/api/bolt/IBolt.java  |  28 ++---
 .../org/apache/heron/api/bolt/IErrorReporter.java  |  28 ++---
 .../apache/heron/api/bolt/IOutputCollector.java    |  28 ++---
 .../java/org/apache/heron/api/bolt/IRichBolt.java  |  28 ++---
 .../heron/api/bolt/IStatefulWindowedBolt.java      |  31 +++--
 .../org/apache/heron/api/bolt/IWindowedBolt.java   |  27 ++--
 .../org/apache/heron/api/bolt/OutputCollector.java |  28 ++---
 .../api/bolt/StatefulWindowedBoltExecutor.java     |  32 +++--
 .../heron/api/bolt/WindowedBoltExecutor.java       |  27 ++--
 .../heron/api/exception/AlreadyAliveException.java |  28 ++---
 .../heron/api/exception/FailedException.java       |  28 ++---
 .../api/exception/InvalidTopologyException.java    |  28 ++---
 .../api/exception/ReportedFailedException.java     |  28 ++---
 .../api/exception/TopologySubmissionException.java |  32 +++--
 .../heron/api/grouping/CustomStreamGrouping.java   |  28 ++---
 .../org/apache/heron/api/hooks/BaseTaskHook.java   |  28 ++---
 .../java/org/apache/heron/api/hooks/ITaskHook.java |  28 ++---
 .../apache/heron/api/hooks/info/BoltAckInfo.java   |  28 ++---
 .../heron/api/hooks/info/BoltExecuteInfo.java      |  28 ++---
 .../apache/heron/api/hooks/info/BoltFailInfo.java  |  28 ++---
 .../org/apache/heron/api/hooks/info/EmitInfo.java  |  28 ++---
 .../apache/heron/api/hooks/info/SpoutAckInfo.java  |  28 ++---
 .../apache/heron/api/hooks/info/SpoutFailInfo.java |  28 ++---
 .../apache/heron/api/metric/AssignableMetric.java  |  28 ++---
 .../apache/heron/api/metric/CombinedMetric.java    |  28 ++---
 .../heron/api/metric/ConcurrentCountMetric.java    |  28 ++---
 .../org/apache/heron/api/metric/CountMetric.java   |  28 ++---
 .../heron/api/metric/CountStatAndMetric.java       |  28 ++---
 .../org/apache/heron/api/metric/GlobalMetrics.java |  28 ++---
 .../org/apache/heron/api/metric/ICombiner.java     |  28 ++---
 .../java/org/apache/heron/api/metric/IMetric.java  |  28 ++---
 .../apache/heron/api/metric/IMetricsRegister.java  |  28 ++---
 .../java/org/apache/heron/api/metric/IReducer.java |  28 ++---
 .../heron/api/metric/LatencyStatAndMetric.java     |  27 ++--
 .../org/apache/heron/api/metric/MeanReducer.java   |  28 ++---
 .../apache/heron/api/metric/MeanReducerState.java  |  28 ++---
 .../apache/heron/api/metric/MetricStatTimer.java   |  28 ++---
 .../heron/api/metric/MultiAssignableMetric.java    |  28 ++---
 .../apache/heron/api/metric/MultiCountMetric.java  |  28 ++---
 .../heron/api/metric/MultiReducedMetric.java       |  28 ++---
 .../org/apache/heron/api/metric/ReducedMetric.java |  28 ++---
 .../heron/api/serializer/IPluggableSerializer.java |  28 ++---
 .../heron/api/serializer/JavaSerializer.java       |  28 ++---
 .../org/apache/heron/api/spout/BaseRichSpout.java  |  28 ++---
 .../heron/api/spout/IMultiSchemableSpout.java      |  28 ++---
 .../org/apache/heron/api/spout/IRichSpout.java     |  28 ++---
 .../apache/heron/api/spout/ISchemableSpout.java    |  28 ++---
 .../java/org/apache/heron/api/spout/ISpout.java    |  28 ++---
 .../heron/api/spout/ISpoutOutputCollector.java     |  28 ++---
 .../org/apache/heron/api/spout/MultiScheme.java    |  28 ++---
 .../org/apache/heron/api/spout/RawMultiScheme.java |  28 ++---
 .../java/org/apache/heron/api/spout/RawScheme.java |  28 ++---
 .../java/org/apache/heron/api/spout/Scheme.java    |  28 ++---
 .../heron/api/spout/SchemeAsMultiScheme.java       |  28 ++---
 .../heron/api/spout/SpoutOutputCollector.java      |  28 ++---
 .../org/apache/heron/api/state/HashMapState.java   |  28 ++---
 .../src/java/org/apache/heron/api/state/State.java |  28 ++---
 .../apache/heron/api/topology/BaseComponent.java   |  28 ++---
 .../heron/api/topology/BaseComponentDeclarer.java  |  28 ++---
 .../api/topology/BaseConfigurationDeclarer.java    |  28 ++---
 .../apache/heron/api/topology/BoltDeclarer.java    |  28 ++---
 .../topology/ComponentConfigurationDeclarer.java   |  28 ++---
 .../heron/api/topology/GeneralTopologyContext.java |  28 ++---
 .../org/apache/heron/api/topology/IComponent.java  |  28 ++---
 .../heron/api/topology/IStatefulComponent.java     |  28 ++---
 .../org/apache/heron/api/topology/IUpdatable.java  |  27 ++--
 .../heron/api/topology/OutputFieldsDeclarer.java   |  28 ++---
 .../heron/api/topology/OutputFieldsGetter.java     |  28 ++---
 .../apache/heron/api/topology/SpoutDeclarer.java   |  28 ++---
 .../apache/heron/api/topology/TopologyBuilder.java |  28 ++---
 .../apache/heron/api/topology/TopologyContext.java |  28 ++---
 .../java/org/apache/heron/api/tuple/Fields.java    |  28 ++---
 .../src/java/org/apache/heron/api/tuple/Tuple.java |  28 ++---
 .../java/org/apache/heron/api/tuple/Values.java    |  28 ++---
 .../api/utils/DefaultMaxSpoutPendingTuner.java     |  28 ++---
 .../org/apache/heron/api/utils/TopologyUtils.java  |  32 +++--
 .../org/apache/heron/api/utils/TupleUtils.java     |  27 ++--
 .../src/java/org/apache/heron/api/utils/Utils.java |  28 ++---
 .../api/windowing/DefaultEvictionContext.java      |  27 ++--
 .../java/org/apache/heron/api/windowing/Event.java |  27 ++--
 .../org/apache/heron/api/windowing/EventImpl.java  |  27 ++--
 .../heron/api/windowing/EvictionContext.java       |  27 ++--
 .../apache/heron/api/windowing/EvictionPolicy.java |  28 ++---
 .../heron/api/windowing/TimestampExtractor.java    |  27 ++--
 .../apache/heron/api/windowing/TriggerHandler.java |  27 ++--
 .../apache/heron/api/windowing/TriggerPolicy.java  |  27 ++--
 .../windowing/TupleFieldTimestampExtractor.java    |  27 ++--
 .../apache/heron/api/windowing/TupleWindow.java    |  27 ++--
 .../heron/api/windowing/TupleWindowImpl.java       |  27 ++--
 .../apache/heron/api/windowing/WaterMarkEvent.java |  27 ++--
 .../api/windowing/WaterMarkEventGenerator.java     |  28 ++---
 .../org/apache/heron/api/windowing/Window.java     |  27 ++--
 .../api/windowing/WindowLifecycleListener.java     |  27 ++--
 .../apache/heron/api/windowing/WindowManager.java  |  28 ++---
 .../heron/api/windowing/WindowingConfigs.java      |  27 ++--
 .../windowing/evictors/CountEvictionPolicy.java    |  27 ++--
 .../api/windowing/evictors/TimeEvictionPolicy.java |  27 ++--
 .../evictors/WatermarkCountEvictionPolicy.java     |  27 ++--
 .../evictors/WatermarkTimeEvictionPolicy.java      |  27 ++--
 .../triggers/AbstractBaseTriggerPolicy.java        |  27 ++--
 .../api/windowing/triggers/CountTriggerPolicy.java |  27 ++--
 .../api/windowing/triggers/TimeTriggerPolicy.java  |  27 ++--
 .../triggers/WatermarkCountTriggerPolicy.java      |  27 ++--
 .../triggers/WatermarkTimeTriggerPolicy.java       |  27 ++--
 .../classification/HeronAnnotationProcessor.java   |  32 +++--
 .../heron/classification/InterfaceAudience.java    |  32 +++--
 .../heron/classification/InterfaceStability.java   |  32 +++--
 .../java/org/apache/heron/streamlet/Builder.java   |  32 +++--
 .../java/org/apache/heron/streamlet/Config.java    |  32 +++--
 .../java/org/apache/heron/streamlet/Context.java   |  32 +++--
 .../java/org/apache/heron/streamlet/JoinType.java  |  32 +++--
 .../java/org/apache/heron/streamlet/KeyValue.java  |  31 +++--
 .../org/apache/heron/streamlet/KeyedWindow.java    |  32 +++--
 .../java/org/apache/heron/streamlet/Runner.java    |  32 +++--
 .../heron/streamlet/SerializableBiFunction.java    |  32 +++--
 .../streamlet/SerializableBinaryOperator.java      |  32 +++--
 .../heron/streamlet/SerializableConsumer.java      |  32 +++--
 .../heron/streamlet/SerializableFunction.java      |  32 +++--
 .../heron/streamlet/SerializablePredicate.java     |  32 +++--
 .../heron/streamlet/SerializableSupplier.java      |  32 +++--
 .../heron/streamlet/SerializableTransformer.java   |  32 +++--
 .../src/java/org/apache/heron/streamlet/Sink.java  |  32 +++--
 .../java/org/apache/heron/streamlet/Source.java    |  32 +++--
 .../java/org/apache/heron/streamlet/Streamlet.java |  31 +++--
 .../java/org/apache/heron/streamlet/Window.java    |  32 +++--
 .../org/apache/heron/streamlet/WindowConfig.java   |  32 +++--
 .../apache/heron/streamlet/impl/BuilderImpl.java   |  32 +++--
 .../apache/heron/streamlet/impl/ContextImpl.java   |  32 +++--
 .../heron/streamlet/impl/KryoSerializer.java       |  32 +++--
 .../apache/heron/streamlet/impl/StreamletImpl.java |  32 +++--
 .../heron/streamlet/impl/WindowConfigImpl.java     |  32 +++--
 .../impl/groupings/JoinCustomGrouping.java         |  32 +++--
 .../ReduceByKeyAndWindowCustomGrouping.java        |  32 +++--
 .../impl/groupings/RemapCustomGrouping.java        |  32 +++--
 .../streamlet/impl/operators/FilterOperator.java   |  32 +++--
 .../streamlet/impl/operators/FlatMapOperator.java  |  32 +++--
 .../GeneralReduceByKeyAndWindowOperator.java       |  32 +++--
 .../streamlet/impl/operators/JoinOperator.java     |  32 +++--
 .../streamlet/impl/operators/MapOperator.java      |  32 +++--
 .../operators/ReduceByKeyAndWindowOperator.java    |  32 +++--
 .../impl/operators/StreamletOperator.java          |  32 +++--
 .../impl/operators/StreamletWindowOperator.java    |  32 +++--
 .../impl/operators/TransformOperator.java          |  32 +++--
 .../streamlet/impl/operators/UnionOperator.java    |  32 +++--
 .../heron/streamlet/impl/sinks/ComplexSink.java    |  32 +++--
 .../heron/streamlet/impl/sinks/ConsumerSink.java   |  32 +++--
 .../apache/heron/streamlet/impl/sinks/LogSink.java |  32 +++--
 .../streamlet/impl/sources/ComplexSource.java      |  32 +++--
 .../streamlet/impl/sources/StreamletSource.java    |  32 +++--
 .../streamlet/impl/sources/SupplierSource.java     |  32 +++--
 .../impl/streamlets/ConsumerStreamlet.java         |  32 +++--
 .../streamlet/impl/streamlets/FilterStreamlet.java |  32 +++--
 .../impl/streamlets/FlatMapStreamlet.java          |  32 +++--
 .../GeneralReduceByKeyAndWindowStreamlet.java      |  32 +++--
 .../streamlet/impl/streamlets/JoinStreamlet.java   |  32 +++--
 .../streamlet/impl/streamlets/LogStreamlet.java    |  32 +++--
 .../streamlet/impl/streamlets/MapStreamlet.java    |  32 +++--
 .../streamlets/ReduceByKeyAndWindowStreamlet.java  |  32 +++--
 .../streamlet/impl/streamlets/RemapStreamlet.java  |  32 +++--
 .../streamlet/impl/streamlets/SinkStreamlet.java   |  32 +++--
 .../streamlet/impl/streamlets/SourceStreamlet.java |  32 +++--
 .../impl/streamlets/SupplierStreamlet.java         |  32 +++--
 .../impl/streamlets/TransformStreamlet.java        |  32 +++--
 .../streamlet/impl/streamlets/UnionStreamlet.java  |  32 +++--
 .../java/org/apache/heron/api/ConfigTest.java      |  31 +++--
 .../org/apache/heron/api/HeronSubmitterTest.java   |  32 +++--
 .../heron/api/bolt/BaseWindowedBoltTest.java       |  32 +++--
 .../heron/api/bolt/WindowedBoltExecutorTest.java   |  32 +++--
 .../heron/api/metric/CountStatAndMetricTest.java   |  32 +++--
 .../heron/api/metric/LatencyStatAndMetricTest.java |  32 +++--
 .../api/windowing/WaterMarkEventGeneratorTest.java |  32 +++--
 .../heron/api/windowing/WindowManagerTest.java     |  32 +++--
 .../heron/streamlet/impl/StreamletImplTest.java    |  32 +++--
 .../GeneralReduceByKeyAndWindowOperatorTest.java   |  32 +++--
 .../streamlet/impl/operators/JoinOperatorTest.java |  32 +++--
 .../ReduceByKeyAndWindowOperatorTest.java          |  32 +++--
 .../apache/heron/ckptmgr/CheckpointManager.java    |  31 +++--
 .../heron/ckptmgr/CheckpointManagerConfig.java     |  31 +++--
 .../heron/ckptmgr/CheckpointManagerConfigKey.java  |  32 +++--
 .../heron/ckptmgr/CheckpointManagerException.java  |  31 +++--
 .../heron/ckptmgr/CheckpointManagerServer.java     |  31 +++--
 .../heron/ckptmgr/CheckpointManagerServerTest.java |  31 +++--
 .../org/apache/heron/common/basics/ByteAmount.java |  32 +++--
 .../apache/heron/common/basics/Communicator.java   |  31 +++--
 .../heron/common/basics/DryRunFormatType.java      |  31 +++--
 .../org/apache/heron/common/basics/FileUtils.java  |  31 +++--
 .../apache/heron/common/basics/ISelectHandler.java |  31 +++--
 .../org/apache/heron/common/basics/NIOLooper.java  |  31 +++--
 .../apache/heron/common/basics/PackageType.java    |  31 +++--
 .../java/org/apache/heron/common/basics/Pair.java  |  31 +++--
 .../heron/common/basics/SingletonRegistry.java     |  31 +++--
 .../apache/heron/common/basics/SlaveLooper.java    |  31 +++--
 .../org/apache/heron/common/basics/SysUtils.java   |  31 +++--
 .../org/apache/heron/common/basics/TypeUtils.java  |  31 +++--
 .../apache/heron/common/basics/WakeableLooper.java |  31 +++--
 .../apache/heron/common/config/ConfigReader.java   |  31 +++--
 .../apache/heron/common/config/SystemConfig.java   |  31 +++--
 .../heron/common/config/SystemConfigKey.java       |  32 +++--
 .../apache/heron/common/network/HeronClient.java   |  31 +++--
 .../apache/heron/common/network/HeronServer.java   |  31 +++--
 .../heron/common/network/HeronSocketOptions.java   |  31 +++--
 .../heron/common/network/IncomingPacket.java       |  31 +++--
 .../heron/common/network/OutgoingPacket.java       |  31 +++--
 .../org/apache/heron/common/network/REQID.java     |  31 +++--
 .../heron/common/network/SocketChannelHelper.java  |  31 +++--
 .../apache/heron/common/network/StatusCode.java    |  31 +++--
 .../common/testhelpers/CommunicatorTestHelper.java |  32 +++--
 .../common/testhelpers/HeronServerTester.java      |  32 +++--
 .../utils/logging/ErrorReportLoggingHandler.java   |  31 +++--
 .../heron/common/utils/logging/LoggingHelper.java  |  31 +++--
 .../heron/common/utils/metrics/BoltMetrics.java    |  31 +++--
 .../common/utils/metrics/ComponentMetrics.java     |  32 +++--
 .../common/utils/metrics/FullBoltMetrics.java      |  31 +++--
 .../common/utils/metrics/FullSpoutMetrics.java     |  31 +++--
 .../heron/common/utils/metrics/JVMMetrics.java     |  31 +++--
 .../common/utils/metrics/MetricsCollector.java     |  31 +++--
 .../heron/common/utils/metrics/SpoutMetrics.java   |  31 +++--
 .../utils/misc/CustomStreamGroupingHelper.java     |  31 +++--
 .../common/utils/misc/PhysicalPlanHelper.java      |  31 +++--
 .../utils/misc/SerializeDeSerializeHelper.java     |  31 +++--
 .../heron/common/utils/misc/ThreadNames.java       |  31 +++--
 .../heron/common/utils/misc/TupleKeyGenerator.java |  31 +++--
 .../utils/topology/GeneralTopologyContextImpl.java |  31 +++--
 .../common/utils/topology/TopologyContextImpl.java |  31 +++--
 .../heron/common/utils/topology/TopologyTests.java |  32 +++--
 .../apache/heron/common/utils/tuple/TickTuple.java |  31 +++--
 .../apache/heron/common/utils/tuple/TupleImpl.java |  31 +++--
 .../apache/heron/common/basics/ByteAmountTest.java |  32 +++--
 .../heron/common/basics/CommunicatorTest.java      |  31 +++--
 .../apache/heron/common/basics/FileUtilsTest.java  |  31 +++--
 .../heron/common/basics/PackageTypeTest.java       |  31 +++--
 .../apache/heron/common/basics/SysUtilsTest.java   |  31 +++--
 .../heron/common/basics/WakeableLooperTest.java    |  31 +++--
 .../heron/common/config/ConfigReaderTest.java      |  31 +++--
 .../heron/common/config/SystemConfigTest.java      |  31 +++--
 .../org/apache/heron/common/test/EchoTest.java     |  31 +++--
 .../apache/heron/common/test/HeronServerTest.java  |  31 +++--
 .../heron/common/utils/TopologyUtilsTest.java      |  31 +++--
 .../org/apache/heron/downloader/DLDownloader.java  |  32 +++--
 .../apache/heron/downloader/DownloadRunner.java    |  32 +++--
 .../org/apache/heron/downloader/Downloader.java    |  32 +++--
 .../org/apache/heron/downloader/Extractor.java     |  32 +++--
 .../apache/heron/downloader/FileDownloader.java    |  32 +++--
 .../apache/heron/downloader/HttpDownloader.java    |  32 +++--
 .../java/org/apache/heron/downloader/Registry.java |  32 +++--
 .../apache/heron/downloader/DLDownloaderTest.java  |  32 +++--
 .../apache/heron/downloader/ExtractorTests.java    |  32 +++--
 .../org/apache/heron/downloader/RegistryTest.java  |  32 +++--
 .../org/apache/heron/healthmgr/HealthManager.java  |  31 +++--
 .../heron/healthmgr/HealthManagerMetrics.java      |  31 +++--
 .../apache/heron/healthmgr/HealthPolicyConfig.java |  31 +++--
 .../heron/healthmgr/HealthPolicyConfigReader.java  |  31 +++--
 .../healthmgr/common/HealthManagerEvents.java      |  31 +++--
 .../healthmgr/common/InvalidStateException.java    |  31 +++--
 .../heron/healthmgr/common/MetricsStats.java       |  32 ++---
 .../healthmgr/common/PackingPlanProvider.java      |  31 +++--
 .../healthmgr/common/PhysicalPlanProvider.java     |  31 +++--
 .../heron/healthmgr/common/TopologyProvider.java   |  31 +++--
 .../healthmgr/detectors/BackPressureDetector.java  |  32 ++---
 .../heron/healthmgr/detectors/BaseDetector.java    |  31 +++--
 .../detectors/GrowingWaitQueueDetector.java        |  32 ++---
 .../detectors/LargeWaitQueueDetector.java          |  32 ++---
 .../detectors/ProcessingRateSkewDetector.java      |  32 ++---
 .../heron/healthmgr/detectors/SkewDetector.java    |  32 ++---
 .../healthmgr/detectors/WaitQueueSkewDetector.java |  32 ++---
 .../heron/healthmgr/diagnosers/BaseDiagnoser.java  |  31 +++--
 .../healthmgr/diagnosers/DataSkewDiagnoser.java    |  32 ++---
 .../diagnosers/SlowInstanceDiagnoser.java          |  31 +++--
 .../diagnosers/UnderProvisioningDiagnoser.java     |  32 ++---
 .../AutoRestartBackpressureContainerPolicy.java    |  32 ++---
 .../policy/DynamicResourceAllocationPolicy.java    |  32 ++---
 .../resolvers/RestartContainerResolver.java        |  32 +++--
 .../heron/healthmgr/resolvers/ScaleUpResolver.java |  32 +++--
 .../healthmgr/sensors/BackPressureSensor.java      |  32 ++---
 .../apache/heron/healthmgr/sensors/BaseSensor.java |  31 +++--
 .../heron/healthmgr/sensors/BufferSizeSensor.java  |  32 ++---
 .../healthmgr/sensors/ExecuteCountSensor.java      |  32 ++---
 .../sensors/MetricsCacheMetricsProvider.java       |  32 ++---
 .../healthmgr/sensors/TrackerMetricsProvider.java  |  32 ++---
 .../apache/heron/healthmgr/HealthManagerTest.java  |  31 +++--
 .../healthmgr/HealthPolicyConfigReaderTest.java    |  31 +++--
 .../healthmgr/common/PackingPlanProviderTest.java  |  31 +++--
 .../healthmgr/common/TopologyProviderTest.java     |  31 +++--
 .../detectors/BackPressureDetectorTest.java        |  31 +++--
 .../detectors/GrowingWaitQueueDetectorTest.java    |  31 +++--
 .../detectors/LargeWaitQueueDetectorTest.java      |  31 +++--
 .../detectors/ProcessingRateSkewDetectorTest.java  |  31 +++--
 .../detectors/WaitQueueSkewDetectorTest.java       |  31 +++--
 .../diagnosers/DataSkewDiagnoserTest.java          |  31 +++--
 .../diagnosers/SlowInstanceDiagnoserTest.java      |  31 +++--
 .../diagnosers/UnderProvisioningDiagnoserTest.java |  31 +++--
 .../healthmgr/resolvers/ScaleUpResolverTest.java   |  31 +++--
 .../healthmgr/sensors/BackPressureSensorTest.java  |  31 +++--
 .../healthmgr/sensors/BufferSizeSensorTest.java    |  31 +++--
 .../healthmgr/sensors/ExecuteCountSensorTest.java  |  31 +++--
 .../sensors/MetricsCacheMetricsProviderTest.java   |  31 +++--
 .../sensors/TrackerMetricsProviderTest.java        |  31 +++--
 .../heron/instance/AbstractOutputCollector.java    |  32 +++--
 .../java/org/apache/heron/instance/Gateway.java    |  31 +++--
 .../org/apache/heron/instance/HeronInstance.java   |  31 +++--
 .../java/org/apache/heron/instance/IInstance.java  |  31 +++--
 .../apache/heron/instance/InstanceControlMsg.java  |  31 +++--
 .../heron/instance/OutgoingTupleCollection.java    |  31 +++--
 .../src/java/org/apache/heron/instance/Slave.java  |  31 +++--
 .../apache/heron/instance/bolt/BoltInstance.java   |  31 +++--
 .../instance/bolt/BoltOutputCollectorImpl.java     |  31 +++--
 .../apache/heron/instance/spout/RootTupleInfo.java |  31 +++--
 .../apache/heron/instance/spout/SpoutInstance.java |  31 +++--
 .../instance/spout/SpoutOutputCollectorImpl.java   |  31 +++--
 .../apache/heron/instance/util/InstanceUtils.java  |  32 +++--
 .../org/apache/heron/instance/util/JvmVersion.java |  32 +++--
 .../org/apache/heron/metrics/GatewayMetrics.java   |  31 +++--
 .../apache/heron/network/MetricsManagerClient.java |  31 +++--
 .../apache/heron/network/StreamManagerClient.java  |  31 +++--
 .../heron/grouping/AbstractTupleRoutingTest.java   |  31 +++--
 .../apache/heron/grouping/CustomGroupingTest.java  |  32 +++--
 .../apache/heron/grouping/EmitDirectBoltTest.java  |  32 +++--
 .../heron/grouping/EmitDirectRoundRobinBolt.java   |  32 +++--
 .../heron/grouping/EmitDirectRoundRobinSpout.java  |  32 +++--
 .../apache/heron/grouping/EmitDirectSpoutTest.java |  32 +++--
 .../apache/heron/instance/CommunicatorTester.java  |  32 +++--
 .../org/apache/heron/instance/SlaveTester.java     |  32 +++--
 .../heron/instance/bolt/BoltInstanceTest.java      |  31 +++--
 .../instance/spout/ActivateDeactivateTest.java     |  31 +++--
 .../heron/instance/spout/SpoutInstanceTest.java    |  31 +++--
 .../apache/heron/metrics/GlobalMetricsTest.java    |  31 +++--
 .../heron/metrics/MultiAssignableMetricTest.java   |  31 +++--
 .../apache/heron/network/AbstractNetworkTest.java  |  32 +++--
 .../java/org/apache/heron/network/ConnectTest.java |  31 +++--
 .../org/apache/heron/network/HandleReadTest.java   |  31 +++--
 .../org/apache/heron/network/HandleWriteTest.java  |  31 +++--
 .../java/org/apache/heron/resource/Constants.java  |  31 +++--
 .../java/org/apache/heron/resource/TestBolt.java   |  31 +++--
 .../java/org/apache/heron/resource/TestSpout.java  |  31 +++--
 .../org/apache/heron/resource/UnitTestHelper.java  |  31 +++--
 .../java/org/apache/heron/dlog/DLInputStream.java  |  32 +++--
 .../java/org/apache/heron/dlog/DLOutputStream.java |  32 +++--
 .../dlog/src/java/org/apache/heron/dlog/Util.java  |  32 +++--
 .../org/apache/heron/dlog/DLInputStreamTest.java   |  32 +++--
 .../org/apache/heron/dlog/DLOutputStreamTest.java  |  32 +++--
 .../heron/metricscachemgr/MetricsCacheManager.java |  32 ++---
 .../MetricsCacheManagerHttpServer.java             |  31 +++--
 .../metricscachemgr/MetricsCacheManagerServer.java |  31 +++--
 .../metricscachemgr/metricscache/CacheCore.java    |  31 +++--
 .../metricscachemgr/metricscache/MetricsCache.java |  31 +++--
 .../metricscache/MetricsCacheQueryUtils.java       |  31 +++--
 .../metricscache/query/ExceptionDatum.java         |  31 +++--
 .../metricscache/query/ExceptionRequest.java       |  31 +++--
 .../metricscache/query/ExceptionResponse.java      |  31 +++--
 .../metricscache/query/MetricDatum.java            |  31 +++--
 .../metricscache/query/MetricGranularity.java      |  31 +++--
 .../metricscache/query/MetricRequest.java          |  31 +++--
 .../metricscache/query/MetricResponse.java         |  31 +++--
 .../metricscache/query/MetricTimeRangeValue.java   |  31 +++--
 .../metricscache/store/ExceptionDatapoint.java     |  31 +++--
 .../metricscache/store/MetricDatapoint.java        |  31 +++--
 .../metricscache/CacheCoreTest.java                |  32 ++---
 .../metricscache/MetricsCacheQueryUtilsTest.java   |  31 +++--
 .../metricscache/MetricsCacheTest.java             |  31 +++--
 .../apache/heron/metricsmgr/MetricsManager.java    |  31 +++--
 .../heron/metricsmgr/MetricsManagerServer.java     |  31 +++--
 .../heron/metricsmgr/MetricsSinksConfig.java       |  31 +++--
 .../org/apache/heron/metricsmgr/MetricsUtil.java   |  32 +++--
 .../heron/metricsmgr/executor/SinkExecutor.java    |  31 +++--
 .../heron/metricsmgr/sink/AbstractWebSink.java     |  32 +++--
 .../org/apache/heron/metricsmgr/sink/FileSink.java |  31 +++--
 .../apache/heron/metricsmgr/sink/GraphiteSink.java |  31 +++--
 .../heron/metricsmgr/sink/PrometheusSink.java      |  32 +++--
 .../heron/metricsmgr/sink/SinkContextImpl.java     |  31 +++--
 .../org/apache/heron/metricsmgr/sink/WebSink.java  |  31 +++--
 .../sink/metricscache/MetricsCacheClient.java      |  31 +++--
 .../sink/metricscache/MetricsCacheSink.java        |  31 +++--
 .../heron/metricsmgr/sink/scribe/ScribeSink.java   |  31 +++--
 .../metricsmgr/sink/tmaster/TMasterClient.java     |  31 +++--
 .../heron/metricsmgr/sink/tmaster/TMasterSink.java |  31 +++--
 heron/metricsmgr/src/thrift/Empty.java             |  32 ++---
 .../metricsmgr/HandleTMasterLocationTest.java      |  31 +++--
 .../heron/metricsmgr/LatchedMultiCountMetric.java  |  32 +++--
 .../heron/metricsmgr/MetricsManagerServerTest.java |  31 +++--
 .../apache/heron/metricsmgr/MetricsUtilTests.java  |  32 +++--
 .../metricsmgr/executor/SinkExecutorTest.java      |  31 +++--
 .../apache/heron/metricsmgr/sink/FileSinkTest.java |  31 +++--
 .../heron/metricsmgr/sink/PrometheusSinkTests.java |  32 +++--
 .../apache/heron/metricsmgr/sink/WebSinkTest.java  |  31 +++--
 .../sink/metricscache/MetricsCacheSinkTest.java    |  31 +++--
 .../metricsmgr/sink/tmaster/TMasterSinkTest.java   |  31 +++--
 .../org/apache/heron/packing/RamRequirement.java   |  31 +++--
 .../heron/packing/ResourceExceededException.java   |  32 +++--
 .../binpacking/FirstFitDecreasingPacking.java      |  31 +++--
 .../apache/heron/packing/builder/Container.java    |  32 +++--
 .../heron/packing/builder/ContainerIdScorer.java   |  32 +++--
 .../heron/packing/builder/HomogeneityScorer.java   |  32 +++--
 .../heron/packing/builder/InstanceCountScorer.java |  32 +++--
 .../heron/packing/builder/PackingPlanBuilder.java  |  32 +++--
 .../org/apache/heron/packing/builder/Scorer.java   |  32 +++--
 .../roundrobin/ResourceCompliantRRPacking.java     |  31 +++--
 .../packing/roundrobin/RoundRobinPacking.java      |  31 +++--
 .../apache/heron/packing/utils/PackingUtils.java   |  32 +++--
 .../org/apache/heron/packing/AssertPacking.java    |  32 +++--
 .../apache/heron/packing/CommonPackingTests.java   |  32 +++--
 .../apache/heron/packing/PackingTestHelper.java    |  32 +++--
 .../binpacking/FirstFitDecreasingPackingTest.java  |  31 +++--
 .../packing/builder/PackingPlanBuilderTest.java    |  32 +++--
 .../apache/heron/packing/builder/ScorerTest.java   |  32 +++--
 .../roundrobin/ResourceCompliantRRPackingTest.java |  31 +++--
 .../packing/roundrobin/RoundRobinPackingTest.java  |  31 +++--
 .../heron/packing/utils/PackingUtilsTest.java      |  32 +++--
 heron/proto/Empty.java                             |  31 +++--
 .../java/org/apache/heron/scheduler/Command.java   |  32 +++--
 .../org/apache/heron/scheduler/ExecutorFlag.java   |  32 +++--
 .../org/apache/heron/scheduler/LaunchRunner.java   |  31 +++--
 .../apache/heron/scheduler/RuntimeManagerMain.java |  31 +++--
 .../heron/scheduler/RuntimeManagerRunner.java      |  31 +++--
 .../org/apache/heron/scheduler/SchedulerMain.java  |  31 +++--
 .../org/apache/heron/scheduler/SubmitterMain.java  |  31 +++--
 .../TopologyRuntimeManagementException.java        |  31 +++--
 .../scheduler/TopologySubmissionException.java     |  31 +++--
 .../heron/scheduler/UpdateTopologyManager.java     |  32 +++--
 .../client/HttpServiceSchedulerClient.java         |  31 +++--
 .../heron/scheduler/client/ISchedulerClient.java   |  31 +++--
 .../scheduler/client/LibrarySchedulerClient.java   |  31 +++--
 .../scheduler/client/SchedulerClientFactory.java   |  31 +++--
 .../heron/scheduler/dryrun/DryRunRender.java       |  32 +++--
 .../heron/scheduler/dryrun/DryRunResponse.java     |  32 +++--
 .../heron/scheduler/dryrun/FormatterUtils.java     |  32 +++--
 .../heron/scheduler/dryrun/JsonFormatterUtils.java |  32 +++--
 .../scheduler/dryrun/SubmitDryRunResponse.java     |  32 +++--
 .../scheduler/dryrun/SubmitJsonDryRunRenderer.java |  32 +++--
 .../scheduler/dryrun/SubmitRawDryRunRenderer.java  |  32 +++--
 .../dryrun/SubmitTableDryRunRenderer.java          |  32 +++--
 .../scheduler/dryrun/UpdateDryRunResponse.java     |  32 +++--
 .../scheduler/dryrun/UpdateJsonDryRunRenderer.java |  32 +++--
 .../scheduler/dryrun/UpdateRawDryRunRenderer.java  |  32 +++--
 .../dryrun/UpdateTableDryRunRenderer.java          |  32 +++--
 .../server/ExceptionalRequestHandler.java          |  32 +++--
 .../heron/scheduler/server/KillRequestHandler.java |  31 +++--
 .../scheduler/server/RestartRequestHandler.java    |  31 +++--
 .../heron/scheduler/server/SchedulerServer.java    |  31 +++--
 .../server/TerminateSchedulerException.java        |  32 +++--
 .../scheduler/server/UpdateRequestHandler.java     |  32 +++--
 .../heron/scheduler/utils/DryRunRenders.java       |  32 +++--
 .../heron/scheduler/utils/LauncherUtils.java       |  31 +++--
 .../org/apache/heron/scheduler/utils/Runtime.java  |  31 +++--
 .../scheduler/utils/SchedulerConfigUtils.java      |  31 +++--
 .../heron/scheduler/utils/SchedulerUtils.java      |  31 +++--
 .../org/apache/heron/scheduler/utils/Shutdown.java |  31 +++--
 .../heron/scheduler/utils/SubmitterUtils.java      |  32 +++--
 .../apache/heron/scheduler/LaunchRunnerTest.java   |  31 +++--
 .../heron/scheduler/RuntimeManagerMainTest.java    |  31 +++--
 .../heron/scheduler/RuntimeManagerRunnerTest.java  |  31 +++--
 .../apache/heron/scheduler/SchedulerMainTest.java  |  31 +++--
 .../apache/heron/scheduler/SubmitterMainTest.java  |  31 +++--
 .../heron/scheduler/UpdateTopologyManagerTest.java |  32 +++--
 .../client/HttpServiceSchedulerClientTest.java     |  31 +++--
 .../client/LibrarySchedulerClientTest.java         |  31 +++--
 .../client/SchedulerClientFactoryTest.java         |  31 +++--
 .../scheduler/dryrun/JsonFormatterUtilsTest.java   |  32 +++--
 .../scheduler/dryrun/SubmitDryRunRenderTest.java   |  32 +++--
 .../scheduler/dryrun/UpdateDryRunRenderTest.java   |  32 +++--
 .../scheduler/server/SchedulerServerTest.java      |  31 +++--
 .../heron/scheduler/utils/LauncherUtilsTest.java   |  31 +++--
 .../heron/scheduler/utils/SchedulerUtilsTest.java  |  31 +++--
 .../org/apache/heron/scheduler/NullLauncher.java   |  31 +++--
 .../org/apache/heron/scheduler/NullScheduler.java  |  31 +++--
 .../scheduler/aurora/AuroraCLIController.java      |  31 +++--
 .../heron/scheduler/aurora/AuroraContext.java      |  31 +++--
 .../heron/scheduler/aurora/AuroraController.java   |  32 +++--
 .../apache/heron/scheduler/aurora/AuroraField.java |  32 +++--
 .../aurora/AuroraHeronShellController.java         |  31 +++--
 .../heron/scheduler/aurora/AuroraLauncher.java     |  31 +++--
 .../heron/scheduler/aurora/AuroraScheduler.java    |  31 +++--
 .../kubernetes/AppsV1beta1Controller.java          |  32 +++--
 .../scheduler/kubernetes/KubernetesCompat.java     |  32 +++--
 .../scheduler/kubernetes/KubernetesConstants.java  |  31 +++--
 .../scheduler/kubernetes/KubernetesContext.java    |  31 +++--
 .../scheduler/kubernetes/KubernetesController.java |  32 +++--
 .../scheduler/kubernetes/KubernetesLauncher.java   |  31 +++--
 .../scheduler/kubernetes/KubernetesScheduler.java  |  31 +++--
 .../scheduler/kubernetes/KubernetesUtils.java      |  32 +++--
 .../apache/heron/scheduler/kubernetes/Volumes.java |  32 +++--
 .../apache/heron/scheduler/local/LocalContext.java |  31 +++--
 .../org/apache/heron/scheduler/local/LocalKey.java |  32 +++--
 .../heron/scheduler/local/LocalLauncher.java       |  31 +++--
 .../heron/scheduler/local/LocalScheduler.java      |  31 +++--
 .../scheduler/marathon/MarathonConstants.java      |  31 +++--
 .../heron/scheduler/marathon/MarathonContext.java  |  31 +++--
 .../scheduler/marathon/MarathonController.java     |  31 +++--
 .../heron/scheduler/marathon/MarathonLauncher.java |  31 +++--
 .../scheduler/marathon/MarathonScheduler.java      |  31 +++--
 .../apache/heron/scheduler/mesos/MesosContext.java |  31 +++--
 .../heron/scheduler/mesos/MesosLauncher.java       |  31 +++--
 .../heron/scheduler/mesos/MesosScheduler.java      |  31 +++--
 .../scheduler/mesos/framework/BaseContainer.java   |  31 +++--
 .../scheduler/mesos/framework/LaunchableTask.java  |  31 +++--
 .../scheduler/mesos/framework/MesosFramework.java  |  31 +++--
 .../scheduler/mesos/framework/TaskResources.java   |  31 +++--
 .../heron/scheduler/mesos/framework/TaskUtils.java |  31 +++--
 .../heron/scheduler/nomad/NomadConstants.java      |  32 +++--
 .../apache/heron/scheduler/nomad/NomadContext.java |  32 +++--
 .../org/apache/heron/scheduler/nomad/NomadKey.java |  32 +++--
 .../heron/scheduler/nomad/NomadLauncher.java       |  32 +++--
 .../heron/scheduler/nomad/NomadScheduler.java      |  32 +++--
 .../apache/heron/scheduler/slurm/SlurmContext.java |  31 +++--
 .../heron/scheduler/slurm/SlurmController.java     |  31 +++--
 .../heron/scheduler/slurm/SlurmLauncher.java       |  31 +++--
 .../heron/scheduler/slurm/SlurmScheduler.java      |  31 +++--
 .../heron/scheduler/utils/HttpJsonClient.java      |  31 +++--
 .../scheduler/yarn/HeronClientConfiguration.java   |  31 +++--
 .../scheduler/yarn/HeronConfigurationOptions.java  |  31 +++--
 .../scheduler/yarn/HeronDriverConfiguration.java   |  31 +++--
 .../heron/scheduler/yarn/HeronExecutorTask.java    |  31 +++--
 .../heron/scheduler/yarn/HeronMasterDriver.java    |  31 +++--
 .../scheduler/yarn/HeronMasterDriverProvider.java  |  31 +++--
 .../heron/scheduler/yarn/HeronReefUtils.java       |  31 +++--
 .../scheduler/yarn/HeronTaskConfiguration.java     |  31 +++--
 .../scheduler/yarn/ReefClientSideHandlers.java     |  31 +++--
 .../apache/heron/scheduler/yarn/YarnContext.java   |  31 +++--
 .../org/apache/heron/scheduler/yarn/YarnKey.java   |  31 +++--
 .../apache/heron/scheduler/yarn/YarnLauncher.java  |  31 +++--
 .../apache/heron/scheduler/yarn/YarnScheduler.java |  31 +++--
 .../scheduler/aurora/AuroraCLIControllerTest.java  |  31 +++--
 .../heron/scheduler/aurora/AuroraContextTest.java  |  32 +++--
 .../heron/scheduler/aurora/AuroraLauncherTest.java |  31 +++--
 .../scheduler/aurora/AuroraSchedulerTest.java      |  31 +++--
 .../kubernetes/KubernetesControllerTest.java       |  31 +++--
 .../kubernetes/KubernetesLauncherTest.java         |  31 +++--
 .../kubernetes/KubernetesSchedulerTest.java        |  31 +++--
 .../heron/scheduler/kubernetes/VolumesTests.java   |  32 +++--
 .../heron/scheduler/local/LocalLauncherTest.java   |  31 +++--
 .../heron/scheduler/local/LocalSchedulerTest.java  |  31 +++--
 .../scheduler/marathon/MarathonControllerTest.java |  31 +++--
 .../scheduler/marathon/MarathonLauncherTest.java   |  31 +++--
 .../scheduler/marathon/MarathonSchedulerTest.java  |  31 +++--
 .../heron/scheduler/mesos/MesosLauncherTest.java   |  31 +++--
 .../heron/scheduler/mesos/MesosSchedulerTest.java  |  31 +++--
 .../mesos/framework/LaunchableTaskTest.java        |  31 +++--
 .../mesos/framework/MesosFrameworkTest.java        |  31 +++--
 .../mesos/framework/TaskResourcesTest.java         |  31 +++--
 .../scheduler/mesos/framework/TaskUtilsTest.java   |  31 +++--
 .../heron/scheduler/nomad/NomadSchedulerTest.java  |  32 +++--
 .../heron/scheduler/slurm/SlurmControllerTest.java |  31 +++--
 .../heron/scheduler/slurm/SlurmLauncherTest.java   |  31 +++--
 .../heron/scheduler/slurm/SlurmSchedulerTest.java  |  31 +++--
 .../scheduler/yarn/HeronExecutorTaskTest.java      |  31 +++--
 .../scheduler/yarn/HeronMasterDriverTest.java      |  31 +++--
 .../heron/scheduler/yarn/YarnLauncherTest.java     |  31 +++--
 .../heron/scheduler/yarn/YarnSchedulerTest.java    |  31 +++--
 .../java/org/apache/heron/simulator/Simulator.java |  31 +++--
 .../simulator/executors/InstanceExecutor.java      |  31 +++--
 .../heron/simulator/executors/MetricsExecutor.java |  31 +++--
 .../heron/simulator/executors/StreamExecutor.java  |  31 +++--
 .../heron/simulator/grouping/AllGrouping.java      |  31 +++--
 .../heron/simulator/grouping/CustomGrouping.java   |  31 +++--
 .../heron/simulator/grouping/FieldsGrouping.java   |  31 +++--
 .../apache/heron/simulator/grouping/Grouping.java  |  31 +++--
 .../heron/simulator/grouping/LowestGrouping.java   |  31 +++--
 .../heron/simulator/grouping/ShuffleGrouping.java  |  31 +++--
 .../heron/simulator/instance/BoltInstance.java     |  31 +++--
 .../heron/simulator/instance/RootTupleInfo.java    |  31 +++--
 .../heron/simulator/instance/SpoutInstance.java    |  31 +++--
 .../apache/heron/simulator/utils/RotatingMap.java  |  31 +++--
 .../heron/simulator/utils/TopologyManager.java     |  31 +++--
 .../apache/heron/simulator/utils/TupleCache.java   |  31 +++--
 .../apache/heron/simulator/utils/XORManager.java   |  31 +++--
 .../org/apache/heron/simulator/SimulatorTest.java  |  31 +++--
 .../simulator/executors/InstanceExecutorTest.java  |  31 +++--
 .../heron/simulator/grouping/AllGroupingTest.java  |  31 +++--
 .../simulator/grouping/CustomGroupingTest.java     |  31 +++--
 .../simulator/grouping/FieldsGroupingTest.java     |  31 +++--
 .../simulator/grouping/LowestGroupingTest.java     |  31 +++--
 .../simulator/grouping/ShuffleGroupingTest.java    |  31 +++--
 .../heron/simulator/utils/RotatingMapTest.java     |  31 +++--
 .../heron/simulator/utils/TopologyManagerTest.java |  31 +++--
 .../heron/simulator/utils/TupleCacheTest.java      |  31 +++--
 .../heron/simulator/utils/XORManagerTest.java      |  31 +++--
 .../java/org/apache/heron/spi/common/Config.java   |  31 +++--
 .../org/apache/heron/spi/common/ConfigLoader.java  |  31 +++--
 .../java/org/apache/heron/spi/common/Context.java  |  31 +++--
 .../src/java/org/apache/heron/spi/common/Key.java  |  32 +++--
 .../java/org/apache/heron/spi/common/TokenSub.java |  31 +++--
 .../spi/metricsmgr/metrics/ExceptionInfo.java      |  31 +++--
 .../spi/metricsmgr/metrics/MetricsFilter.java      |  31 +++--
 .../heron/spi/metricsmgr/metrics/MetricsInfo.java  |  31 +++--
 .../spi/metricsmgr/metrics/MetricsRecord.java      |  31 +++--
 .../heron/spi/metricsmgr/sink/IMetricsSink.java    |  31 +++--
 .../heron/spi/metricsmgr/sink/SinkContext.java     |  31 +++--
 .../org/apache/heron/spi/packing/IPacking.java     |  31 +++--
 .../org/apache/heron/spi/packing/IRepacking.java   |  32 +++--
 .../org/apache/heron/spi/packing/InstanceId.java   |  32 +++--
 .../apache/heron/spi/packing/PackingException.java |  32 +++--
 .../org/apache/heron/spi/packing/PackingPlan.java  |  31 +++--
 .../spi/packing/PackingPlanProtoDeserializer.java  |  32 +++--
 .../spi/packing/PackingPlanProtoSerializer.java    |  32 +++--
 .../org/apache/heron/spi/packing/Resource.java     |  31 +++--
 .../org/apache/heron/spi/scheduler/ILauncher.java  |  31 +++--
 .../org/apache/heron/spi/scheduler/IScalable.java  |  32 +++--
 .../org/apache/heron/spi/scheduler/IScheduler.java |  31 +++--
 .../heron/spi/scheduler/LauncherException.java     |  32 +++--
 .../heron/spi/scheduler/SchedulerException.java    |  31 +++--
 .../heron/spi/statefulstorage/Checkpoint.java      |  31 +++--
 .../spi/statefulstorage/IStatefulStorage.java      |  31 +++--
 .../statefulstorage/StatefulStorageException.java  |  31 +++--
 .../apache/heron/spi/statemgr/IStateManager.java   |  31 +++--
 .../java/org/apache/heron/spi/statemgr/Lock.java   |  32 +++--
 .../spi/statemgr/SchedulerStateManagerAdaptor.java |  31 +++--
 .../apache/heron/spi/statemgr/WatchCallback.java   |  31 +++--
 .../org/apache/heron/spi/uploader/IUploader.java   |  31 +++--
 .../heron/spi/uploader/UploaderException.java      |  32 +++--
 .../org/apache/heron/spi/utils/NetworkUtils.java   |  31 +++--
 .../apache/heron/spi/utils/PackingTestUtils.java   |  32 +++--
 .../apache/heron/spi/utils/ReflectionUtils.java    |  31 +++--
 .../org/apache/heron/spi/utils/ShellUtils.java     |  31 +++--
 .../apache/heron/spi/utils/TMasterException.java   |  31 +++--
 .../org/apache/heron/spi/utils/TMasterUtils.java   |  31 +++--
 .../org/apache/heron/spi/utils/UploaderUtils.java  |  31 +++--
 .../apache/heron/spi/common/ConfigLoaderTest.java  |  31 +++--
 .../org/apache/heron/spi/common/ConfigTest.java    |  32 +++--
 .../org/apache/heron/spi/common/ContextTest.java   |  31 +++--
 .../java/org/apache/heron/spi/common/KeysTest.java |  31 +++--
 .../org/apache/heron/spi/common/TokenSubTest.java  |  31 +++--
 .../spi/metricsmgr/metrics/ExceptionInfoTest.java  |  31 +++--
 .../spi/metricsmgr/metrics/MetricsInfoTest.java    |  31 +++--
 .../spi/metricsmgr/metrics/MetricsRecordTest.java  |  31 +++--
 .../apache/heron/spi/packing/PackingPlanTest.java  |  31 +++--
 .../org/apache/heron/spi/packing/ResourceTest.java |  31 +++--
 .../apache/heron/spi/utils/NetworkUtilsTest.java   |  31 +++--
 .../org/apache/heron/spi/utils/ShellUtilsTest.java |  31 +++--
 .../apache/heron/spi/utils/UploaderUtilsTest.java  |  31 +++--
 .../heron/statefulstorage/dlog/DlogStorage.java    |  32 +++--
 .../heron/statefulstorage/hdfs/HDFSStorage.java    |  31 +++--
 .../localfs/LocalFileSystemStorage.java            |  31 +++--
 .../StatefulStorageTestContext.java                |  31 +++--
 .../statefulstorage/dlog/DlogStorageTest.java      |  32 +++--
 .../statefulstorage/hdfs/HDFSStorageTest.java      |  31 +++--
 .../localfs/LocalFileSystemStorageTest.java        |  31 +++--
 .../heron/statemgr/FileSystemStateManager.java     |  31 +++--
 .../apache/heron/statemgr/NullStateManager.java    |  31 +++--
 .../statemgr/localfs/LocalFileSystemContext.java   |  31 +++--
 .../heron/statemgr/localfs/LocalFileSystemKey.java |  32 +++--
 .../localfs/LocalFileSystemStateManager.java       |  31 +++--
 .../apache/heron/statemgr/zookeeper/ZkContext.java |  31 +++--
 .../apache/heron/statemgr/zookeeper/ZkUtils.java   |  31 +++--
 .../statemgr/zookeeper/ZkWatcherCallback.java      |  31 +++--
 .../zookeeper/curator/CuratorStateManager.java     |  31 +++--
 .../localfs/LocalFileSystemStateManagerTest.java   |  31 +++--
 .../heron/statemgr/zookeeper/ZkUtilsTest.java      |  31 +++--
 .../zookeeper/curator/CuratorStateManagerTest.java |  31 +++--
 .../java/org/apache/heron/apiserver/Constants.java |  32 +++--
 .../java/org/apache/heron/apiserver/Resources.java |  32 +++--
 .../java/org/apache/heron/apiserver/Runtime.java   |  32 +++--
 .../org/apache/heron/apiserver/actions/Action.java |  32 +++--
 .../heron/apiserver/actions/ActionFactory.java     |  32 +++--
 .../heron/apiserver/actions/ActionFactoryImpl.java |  32 +++--
 .../apache/heron/apiserver/actions/ActionType.java |  32 +++--
 .../org/apache/heron/apiserver/actions/Keys.java   |  32 +++--
 .../apiserver/actions/SubmitTopologyAction.java    |  32 +++--
 .../apiserver/actions/TopologyRuntimeAction.java   |  32 +++--
 .../apiserver/resources/ConfigurationResource.java |  32 +++--
 .../heron/apiserver/resources/FileResource.java    |  32 +++--
 .../apache/heron/apiserver/resources/Forms.java    |  32 +++--
 .../heron/apiserver/resources/HeronResource.java   |  32 +++--
 .../resources/NotFoundExceptionHandler.java        |  32 +++--
 .../apiserver/resources/TopologyResource.java      |  32 +++--
 .../apache/heron/apiserver/utils/ConfigUtils.java  |  32 +++--
 .../apache/heron/apiserver/utils/FileHelper.java   |  32 +++--
 .../org/apache/heron/apiserver/utils/Logging.java  |  32 +++--
 .../org/apache/heron/apiserver/utils/Utils.java    |  32 +++--
 .../apiserver/resources/TopologyResourceTests.java |  32 +++--
 .../heron/apiserver/utils/ConfigUtilsTests.java    |  32 +++--
 .../org/apache/heron/uploader/NullUploader.java    |  31 +++--
 .../org/apache/heron/uploader/dlog/Copier.java     |  32 +++--
 .../org/apache/heron/uploader/dlog/DLContext.java  |  32 +++--
 .../org/apache/heron/uploader/dlog/DLCopier.java   |  32 +++--
 .../org/apache/heron/uploader/dlog/DLUploader.java |  32 +++--
 .../org/apache/heron/uploader/gcs/GcsContext.java  |  32 +++--
 .../apache/heron/uploader/gcs/GcsController.java   |  32 +++--
 .../org/apache/heron/uploader/gcs/GcsUploader.java |  32 +++--
 .../apache/heron/uploader/hdfs/HdfsContext.java    |  31 +++--
 .../apache/heron/uploader/hdfs/HdfsController.java |  31 +++--
 .../apache/heron/uploader/hdfs/HdfsUploader.java   |  31 +++--
 .../apache/heron/uploader/http/HttpUploader.java   |  32 +++--
 .../heron/uploader/http/HttpUploaderContext.java   |  32 +++--
 .../uploader/localfs/LocalFileSystemContext.java   |  31 +++--
 .../heron/uploader/localfs/LocalFileSystemKey.java |  32 +++--
 .../uploader/localfs/LocalFileSystemUploader.java  |  31 +++--
 .../org/apache/heron/uploader/s3/S3Context.java    |  31 +++--
 .../org/apache/heron/uploader/s3/S3Uploader.java   |  31 +++--
 .../org/apache/heron/uploader/scp/ScpContext.java  |  31 +++--
 .../apache/heron/uploader/scp/ScpController.java   |  31 +++--
 .../org/apache/heron/uploader/scp/ScpUploader.java |  31 +++--
 .../heron/uploader/dlog/DlogUploaderTest.java      |  32 +++--
 .../heron/uploader/gcs/GcsUploaderTests.java       |  32 +++--
 .../heron/uploader/hdfs/HdfsUploaderTest.java      |  31 +++--
 .../heron/uploader/http/HttpUploaderTest.java      |  32 +++--
 .../localfs/LocalFileSystemConfigTest.java         |  31 +++--
 .../localfs/LocalFileSystemConstantsTest.java      |  31 +++--
 .../localfs/LocalFileSystemContextTest.java        |  32 +++--
 .../localfs/LocalFileSystemUploaderTest.java       |  31 +++--
 .../apache/heron/uploader/s3/S3UploaderTest.java   |  31 +++--
 .../apache/heron/uploader/scp/ScpUploaderTest.java |  31 +++--
 .../common/AbstractTestTopology.java               |  32 +++--
 .../heron/integration_test/common/BasicConfig.java |  32 +++--
 .../heron/integration_test/common/HdfsHelper.java  |  32 +++--
 .../common/bolt/CountAggregatorBolt.java           |  32 +++--
 .../common/bolt/DoubleTuplesBolt.java              |  32 +++--
 .../integration_test/common/bolt/IdentityBolt.java |  32 +++--
 .../common/bolt/IncrementBolt.java                 |  32 +++--
 .../common/bolt/JSONTweetFilterBolt.java           |  32 +++--
 .../common/bolt/LocalWriteBolt.java                |  32 +++--
 .../common/bolt/MapAggregatorBolt.java             |  32 +++--
 .../common/bolt/PartialUniquerBolt.java            |  32 +++--
 .../common/bolt/TweetPropertyBolt.java             |  32 +++--
 .../common/bolt/WordCountBolt.java                 |  32 +++--
 .../integration_test/common/spout/ABSpout.java     |  32 +++--
 .../common/spout/HdfsStringSpout.java              |  32 +++--
 .../common/spout/LocalFileSpout.java               |  32 +++--
 .../common/spout/PausedLocalFileSpout.java         |  32 +++--
 .../integration_test/core/AggregatorBolt.java      |  32 +++--
 .../heron/integration_test/core/BaseBatchBolt.java |  32 +++--
 .../heron/integration_test/core/Condition.java     |  32 +++--
 .../heron/integration_test/core/Constants.java     |  32 +++--
 .../core/EmitUntilConditionTestSpout.java          |  32 +++--
 .../integration_test/core/HttpGetCondition.java    |  32 +++--
 .../heron/integration_test/core/HttpUtils.java     |  32 +++--
 .../heron/integration_test/core/IBatchBolt.java    |  32 +++--
 .../heron/integration_test/core/ITerminalBolt.java |  32 +++--
 .../integration_test/core/IntegrationTestBolt.java |  32 +++--
 .../core/IntegrationTestSpout.java                 |  32 +++--
 .../integration_test/core/LocalAggregatorBolt.java |  32 +++--
 .../integration_test/core/MultiPhaseTestSpout.java |  32 +++--
 .../core/StatefulIntegrationTestBolt.java          |  31 +++--
 .../core/StatefulIntegrationTestSpout.java         |  32 +++--
 .../integration_test/core/TestTopologyBuilder.java |  32 +++--
 .../integration_test/core/TestTopologyContext.java |  32 +++--
 .../topology/all_grouping/AllGrouping.java         |  32 +++--
 .../BasicTopologyOneTask.java                      |  32 +++--
 .../BoltDoubleEmitTuples.java                      |  32 +++--
 .../topology/fields_grouping/FieldsGrouping.java   |  32 +++--
 .../topology/global_grouping/GlobalGrouping.java   |  32 +++--
 .../MultiSpoutsMultiTasks.java                     |  32 +++--
 .../topology/non_grouping/NonGrouping.java         |  32 +++--
 .../one_bolt_multi_tasks/OneBoltMultiTasks.java    |  32 +++--
 .../OneSpoutBoltMultiTasks.java                    |  32 +++--
 .../one_spout_multi_tasks/OneSpoutMultiTasks.java  |  32 +++--
 .../one_spout_two_bolts/OneSpoutTwoBolts.java      |  32 +++--
 .../topology/serialization/CustomCheckBolt.java    |  32 +++--
 .../topology/serialization/CustomObject.java       |  32 +++--
 .../topology/serialization/CustomSpout.java        |  32 +++--
 .../serialization/SerializationTopology.java       |  32 +++--
 .../topology/shuffle_grouping/ShuffleGrouping.java |  32 +++--
 .../topology/windowing/WindowTestBase.java         |  32 +++--
 .../windowing/count/SlidingCountWindowTest1.java   |  32 +++--
 .../windowing/count/SlidingCountWindowTest2.java   |  32 +++--
 .../windowing/count/SlidingCountWindowTest3.java   |  32 +++--
 .../windowing/count/TumblingCountWindowTest1.java  |  32 +++--
 .../windowing/count/TumblingCountWindowTest2.java  |  32 +++--
 .../windowing/count/TumblingCountWindowTest3.java  |  32 +++--
 .../windowing/stateful/StatefulWindowingTest.java  |  31 +++--
 .../windowing/time/SlidingTimeWindowTest1.java     |  32 +++--
 .../SlidingWatermarkEventTimeWindowTest1.java      |  32 +++--
 .../local_readwrite/LocalReadWriteTopology.java    |  32 +++--
 third_party/java/bazel/Empty.java                  |  31 +++--
 .../org/apache/bazel/checkstyle/CppCheckstyle.java |  32 +++--
 .../apache/bazel/checkstyle/ExtraActionUtils.java  |  32 +++--
 .../apache/bazel/checkstyle/JavaCheckstyle.java    |  32 +++--
 .../apache/bazel/checkstyle/PythonCheckstyle.java  |  32 +++--
 .../org/apache/bazel/checkstyle/heron_header.txt   |  31 +++--
 877 files changed, 14932 insertions(+), 12393 deletions(-)

diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/EvenAndOddBolt.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/EvenAndOddBolt.java
index 61918ce..90e8b86 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/EvenAndOddBolt.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/EvenAndOddBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/LogInfoBolt.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/LogInfoBolt.java
index dba8f11..326ba63 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/LogInfoBolt.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/LogInfoBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/RandomString.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/RandomString.java
index 2d794d6..36f1201 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/RandomString.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/RandomString.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Random;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulConsumerBolt.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulConsumerBolt.java
index 5831a53..486d9f0 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulConsumerBolt.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulConsumerBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulNumberSpout.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulNumberSpout.java
index aae0053..f2566e8 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulNumberSpout.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulNumberSpout.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulRandomIntSpout.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulRandomIntSpout.java
index 5c8bfcf..7907691 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulRandomIntSpout.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulRandomIntSpout.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulWindowSumBolt.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulWindowSumBolt.java
index 7d9b31f..ec73c7e 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulWindowSumBolt.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/StatefulWindowSumBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
index 4bfd9c6..7ae83a2 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestIBasicPrintBolt.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestIBasicPrintBolt.java
index 05ad33f..357196d 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestIBasicPrintBolt.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestIBasicPrintBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestNameCounter.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestNameCounter.java
index 583f0a5..ca0c0ae 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestNameCounter.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestNameCounter.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.HashMap;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
index f31fabc..7bd262a 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.HashMap;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestPrintBolt.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestPrintBolt.java
index 35bd499..ca4740b 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestPrintBolt.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestPrintBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import org.apache.heron.api.bolt.BaseBasicBolt;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestPropertyHolder.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestPropertyHolder.java
index ff92a38..2ffc271 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestPropertyHolder.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestPropertyHolder.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.io.Serializable;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestUnits.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestUnits.java
index 4df8b42..dfa3cc6 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestUnits.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestUnits.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 /**
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
index 5a45e20..c65c2ef 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/WordSpout.java b/eco-heron-examples/src/java/org/apache/heron/examples/eco/WordSpout.java
index 8ab4d31..250504b 100644
--- a/eco-heron-examples/src/java/org/apache/heron/examples/eco/WordSpout.java
+++ b/eco-heron-examples/src/java/org/apache/heron/examples/eco/WordSpout.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/EvenAndOddBolt.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/EvenAndOddBolt.java
index ed6bd07..204c298 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/EvenAndOddBolt.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/EvenAndOddBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/LogInfoBolt.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/LogInfoBolt.java
index e506f8c..68d1dbc 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/LogInfoBolt.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/LogInfoBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
index 6c5376b..451246a 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestIBasicPrintBolt.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestIBasicPrintBolt.java
index 0914677..25f5e41 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestIBasicPrintBolt.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestIBasicPrintBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameCounter.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameCounter.java
index cde5bfd..d168704 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameCounter.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameCounter.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.HashMap;
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
index 101051e..23c3e34 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.HashMap;
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestPrintBolt.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestPrintBolt.java
index ef31403..4ba6580 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestPrintBolt.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestPrintBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import org.apache.storm.topology.BasicOutputCollector;
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestPropertyHolder.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestPropertyHolder.java
index ff92a38..2ffc271 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestPropertyHolder.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestPropertyHolder.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.io.Serializable;
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestUnits.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestUnits.java
index 4df8b42..dfa3cc6 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestUnits.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestUnits.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 /**
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
index 99facd1..e6a9f2b 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.eco;
 
 import java.util.Map;
diff --git a/eco/src/java/org/apache/heron/eco/Eco.java b/eco/src/java/org/apache/heron/eco/Eco.java
index ca1ea14..c5c2d45 100644
--- a/eco/src/java/org/apache/heron/eco/Eco.java
+++ b/eco/src/java/org/apache/heron/eco/Eco.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco;
 
 import java.io.File;
diff --git a/eco/src/java/org/apache/heron/eco/builder/BoltBuilder.java b/eco/src/java/org/apache/heron/eco/builder/BoltBuilder.java
index b5f1ffd..83da177 100644
--- a/eco/src/java/org/apache/heron/eco/builder/BoltBuilder.java
+++ b/eco/src/java/org/apache/heron/eco/builder/BoltBuilder.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/src/java/org/apache/heron/eco/builder/BuilderUtility.java b/eco/src/java/org/apache/heron/eco/builder/BuilderUtility.java
index 7a217cf..148ea4c 100644
--- a/eco/src/java/org/apache/heron/eco/builder/BuilderUtility.java
+++ b/eco/src/java/org/apache/heron/eco/builder/BuilderUtility.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder;
 
 import java.lang.reflect.Field;
diff --git a/eco/src/java/org/apache/heron/eco/builder/ComponentBuilder.java b/eco/src/java/org/apache/heron/eco/builder/ComponentBuilder.java
index 46a05f7..e0db42c 100644
--- a/eco/src/java/org/apache/heron/eco/builder/ComponentBuilder.java
+++ b/eco/src/java/org/apache/heron/eco/builder/ComponentBuilder.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/src/java/org/apache/heron/eco/builder/ConfigBuilder.java b/eco/src/java/org/apache/heron/eco/builder/ConfigBuilder.java
index ccc5bc6..978158a 100644
--- a/eco/src/java/org/apache/heron/eco/builder/ConfigBuilder.java
+++ b/eco/src/java/org/apache/heron/eco/builder/ConfigBuilder.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder;
 
 import java.util.List;
diff --git a/eco/src/java/org/apache/heron/eco/builder/ObjectBuilder.java b/eco/src/java/org/apache/heron/eco/builder/ObjectBuilder.java
index 47ff51b..9101963 100644
--- a/eco/src/java/org/apache/heron/eco/builder/ObjectBuilder.java
+++ b/eco/src/java/org/apache/heron/eco/builder/ObjectBuilder.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder;
 
 import java.lang.reflect.Array;
diff --git a/eco/src/java/org/apache/heron/eco/builder/heron/EcoBuilder.java b/eco/src/java/org/apache/heron/eco/builder/heron/EcoBuilder.java
index 9e127f7..f89a8ef 100644
--- a/eco/src/java/org/apache/heron/eco/builder/heron/EcoBuilder.java
+++ b/eco/src/java/org/apache/heron/eco/builder/heron/EcoBuilder.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.heron;
 
 
diff --git a/eco/src/java/org/apache/heron/eco/builder/heron/SpoutBuilder.java b/eco/src/java/org/apache/heron/eco/builder/heron/SpoutBuilder.java
index 9948376..6efa780 100644
--- a/eco/src/java/org/apache/heron/eco/builder/heron/SpoutBuilder.java
+++ b/eco/src/java/org/apache/heron/eco/builder/heron/SpoutBuilder.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.heron;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/src/java/org/apache/heron/eco/builder/heron/StreamBuilder.java b/eco/src/java/org/apache/heron/eco/builder/heron/StreamBuilder.java
index ac42dfd..d2d4530 100644
--- a/eco/src/java/org/apache/heron/eco/builder/heron/StreamBuilder.java
+++ b/eco/src/java/org/apache/heron/eco/builder/heron/StreamBuilder.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.heron;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/src/java/org/apache/heron/eco/builder/storm/EcoBuilder.java b/eco/src/java/org/apache/heron/eco/builder/storm/EcoBuilder.java
index 6be5979..7e6953c 100644
--- a/eco/src/java/org/apache/heron/eco/builder/storm/EcoBuilder.java
+++ b/eco/src/java/org/apache/heron/eco/builder/storm/EcoBuilder.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.storm;
 
 
diff --git a/eco/src/java/org/apache/heron/eco/builder/storm/SpoutBuilder.java b/eco/src/java/org/apache/heron/eco/builder/storm/SpoutBuilder.java
index 15f94f0..be3bc8e 100644
--- a/eco/src/java/org/apache/heron/eco/builder/storm/SpoutBuilder.java
+++ b/eco/src/java/org/apache/heron/eco/builder/storm/SpoutBuilder.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.storm;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/src/java/org/apache/heron/eco/builder/storm/StreamBuilder.java b/eco/src/java/org/apache/heron/eco/builder/storm/StreamBuilder.java
index a3762d6..d6377ce 100644
--- a/eco/src/java/org/apache/heron/eco/builder/storm/StreamBuilder.java
+++ b/eco/src/java/org/apache/heron/eco/builder/storm/StreamBuilder.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.storm;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/src/java/org/apache/heron/eco/definition/BeanDefinition.java b/eco/src/java/org/apache/heron/eco/definition/BeanDefinition.java
index 2489be2..5eda906 100644
--- a/eco/src/java/org/apache/heron/eco/definition/BeanDefinition.java
+++ b/eco/src/java/org/apache/heron/eco/definition/BeanDefinition.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 public class BeanDefinition extends ObjectDefinition {
diff --git a/eco/src/java/org/apache/heron/eco/definition/BeanListReference.java b/eco/src/java/org/apache/heron/eco/definition/BeanListReference.java
index 25233d9..a6ee11b 100644
--- a/eco/src/java/org/apache/heron/eco/definition/BeanListReference.java
+++ b/eco/src/java/org/apache/heron/eco/definition/BeanListReference.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 import java.util.List;
diff --git a/eco/src/java/org/apache/heron/eco/definition/BeanReference.java b/eco/src/java/org/apache/heron/eco/definition/BeanReference.java
index da4ac41..4434321 100644
--- a/eco/src/java/org/apache/heron/eco/definition/BeanReference.java
+++ b/eco/src/java/org/apache/heron/eco/definition/BeanReference.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 public class BeanReference {
diff --git a/eco/src/java/org/apache/heron/eco/definition/BoltDefinition.java b/eco/src/java/org/apache/heron/eco/definition/BoltDefinition.java
index bcb6d0d..84ac41f 100644
--- a/eco/src/java/org/apache/heron/eco/definition/BoltDefinition.java
+++ b/eco/src/java/org/apache/heron/eco/definition/BoltDefinition.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 public class BoltDefinition extends ObjectDefinition {
diff --git a/eco/src/java/org/apache/heron/eco/definition/ComponentStream.java b/eco/src/java/org/apache/heron/eco/definition/ComponentStream.java
index e33d035..7791be8 100644
--- a/eco/src/java/org/apache/heron/eco/definition/ComponentStream.java
+++ b/eco/src/java/org/apache/heron/eco/definition/ComponentStream.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 public class ComponentStream {
diff --git a/eco/src/java/org/apache/heron/eco/definition/ConfigurationMethodDefinition.java b/eco/src/java/org/apache/heron/eco/definition/ConfigurationMethodDefinition.java
index 6f5da4a..eb6eeac 100644
--- a/eco/src/java/org/apache/heron/eco/definition/ConfigurationMethodDefinition.java
+++ b/eco/src/java/org/apache/heron/eco/definition/ConfigurationMethodDefinition.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 import java.util.ArrayList;
diff --git a/eco/src/java/org/apache/heron/eco/definition/EcoExecutionContext.java b/eco/src/java/org/apache/heron/eco/definition/EcoExecutionContext.java
index 1061f69..fa29af5 100644
--- a/eco/src/java/org/apache/heron/eco/definition/EcoExecutionContext.java
+++ b/eco/src/java/org/apache/heron/eco/definition/EcoExecutionContext.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 import java.util.HashMap;
diff --git a/eco/src/java/org/apache/heron/eco/definition/EcoTopologyDefinition.java b/eco/src/java/org/apache/heron/eco/definition/EcoTopologyDefinition.java
index 99261dc..00a19da 100644
--- a/eco/src/java/org/apache/heron/eco/definition/EcoTopologyDefinition.java
+++ b/eco/src/java/org/apache/heron/eco/definition/EcoTopologyDefinition.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 import java.util.ArrayList;
diff --git a/eco/src/java/org/apache/heron/eco/definition/GroupingDefinition.java b/eco/src/java/org/apache/heron/eco/definition/GroupingDefinition.java
index 1690d69..ce14429 100644
--- a/eco/src/java/org/apache/heron/eco/definition/GroupingDefinition.java
+++ b/eco/src/java/org/apache/heron/eco/definition/GroupingDefinition.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 import java.util.List;
diff --git a/eco/src/java/org/apache/heron/eco/definition/ObjectDefinition.java b/eco/src/java/org/apache/heron/eco/definition/ObjectDefinition.java
index 6ad931c..c818948 100644
--- a/eco/src/java/org/apache/heron/eco/definition/ObjectDefinition.java
+++ b/eco/src/java/org/apache/heron/eco/definition/ObjectDefinition.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 import java.util.ArrayList;
diff --git a/eco/src/java/org/apache/heron/eco/definition/PropertyDefinition.java b/eco/src/java/org/apache/heron/eco/definition/PropertyDefinition.java
index 8efbe0f..1658606 100644
--- a/eco/src/java/org/apache/heron/eco/definition/PropertyDefinition.java
+++ b/eco/src/java/org/apache/heron/eco/definition/PropertyDefinition.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 public class PropertyDefinition {
diff --git a/eco/src/java/org/apache/heron/eco/definition/SpoutDefinition.java b/eco/src/java/org/apache/heron/eco/definition/SpoutDefinition.java
index 3eb8681..8da368f 100644
--- a/eco/src/java/org/apache/heron/eco/definition/SpoutDefinition.java
+++ b/eco/src/java/org/apache/heron/eco/definition/SpoutDefinition.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 public class SpoutDefinition extends ObjectDefinition {
diff --git a/eco/src/java/org/apache/heron/eco/definition/StreamDefinition.java b/eco/src/java/org/apache/heron/eco/definition/StreamDefinition.java
index d6cc6f6..8fa4d3d 100644
--- a/eco/src/java/org/apache/heron/eco/definition/StreamDefinition.java
+++ b/eco/src/java/org/apache/heron/eco/definition/StreamDefinition.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.definition;
 
 public class StreamDefinition {
diff --git a/eco/src/java/org/apache/heron/eco/parser/EcoParser.java b/eco/src/java/org/apache/heron/eco/parser/EcoParser.java
index ce8fdb9..e5583e6 100644
--- a/eco/src/java/org/apache/heron/eco/parser/EcoParser.java
+++ b/eco/src/java/org/apache/heron/eco/parser/EcoParser.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.parser;
 
 import java.io.ByteArrayOutputStream;
diff --git a/eco/src/java/org/apache/heron/eco/submit/EcoSubmitter.java b/eco/src/java/org/apache/heron/eco/submit/EcoSubmitter.java
index 67b05ee..26c7765 100644
--- a/eco/src/java/org/apache/heron/eco/submit/EcoSubmitter.java
+++ b/eco/src/java/org/apache/heron/eco/submit/EcoSubmitter.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.submit;
 
 import org.apache.heron.api.Config;
diff --git a/eco/tests/java/org/apache/heron/eco/EcoTest.java b/eco/tests/java/org/apache/heron/eco/EcoTest.java
index c2a107a..5ca1efa 100644
--- a/eco/tests/java/org/apache/heron/eco/EcoTest.java
+++ b/eco/tests/java/org/apache/heron/eco/EcoTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco;
 
 import java.io.FileInputStream;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/BoltBuilderTest.java b/eco/tests/java/org/apache/heron/eco/builder/BoltBuilderTest.java
index c917602..be07c2d 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/BoltBuilderTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/BoltBuilderTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/BuilderUtilityTest.java b/eco/tests/java/org/apache/heron/eco/builder/BuilderUtilityTest.java
index 01543ea..cc7ef66 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/BuilderUtilityTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/BuilderUtilityTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/ComponentBuilderTest.java b/eco/tests/java/org/apache/heron/eco/builder/ComponentBuilderTest.java
index 71aba93..29839d5 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/ComponentBuilderTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/ComponentBuilderTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/ConfigBuilderTest.java b/eco/tests/java/org/apache/heron/eco/builder/ConfigBuilderTest.java
index 6cbd337..dfbf3dd 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/ConfigBuilderTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/ConfigBuilderTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder;
 
 import java.io.ByteArrayInputStream;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/ObjectBuilderTest.java b/eco/tests/java/org/apache/heron/eco/builder/ObjectBuilderTest.java
index a4da821..6bdd1d0 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/ObjectBuilderTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/ObjectBuilderTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/heron/HeronEcoBuilderTest.java b/eco/tests/java/org/apache/heron/eco/builder/heron/HeronEcoBuilderTest.java
index cbfc1db..386889d 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/heron/HeronEcoBuilderTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/heron/HeronEcoBuilderTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.heron;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/heron/HeronSpoutBuilderTest.java b/eco/tests/java/org/apache/heron/eco/builder/heron/HeronSpoutBuilderTest.java
index 85fd1c5..00b2c6a 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/heron/HeronSpoutBuilderTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/heron/HeronSpoutBuilderTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.heron;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/heron/HeronStreamBuilderTest.java b/eco/tests/java/org/apache/heron/eco/builder/heron/HeronStreamBuilderTest.java
index c07c52c..47f1b6a 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/heron/HeronStreamBuilderTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/heron/HeronStreamBuilderTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.heron;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/storm/StormEcoBuilderTest.java b/eco/tests/java/org/apache/heron/eco/builder/storm/StormEcoBuilderTest.java
index 9d1e46f..64e2c2f 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/storm/StormEcoBuilderTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/storm/StormEcoBuilderTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.storm;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/storm/StormSpoutBuilderTest.java b/eco/tests/java/org/apache/heron/eco/builder/storm/StormSpoutBuilderTest.java
index 11c83ec..b136247 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/storm/StormSpoutBuilderTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/storm/StormSpoutBuilderTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.storm;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/tests/java/org/apache/heron/eco/builder/storm/StormStreamBuilderTest.java b/eco/tests/java/org/apache/heron/eco/builder/storm/StormStreamBuilderTest.java
index 34a78a2..95df652 100644
--- a/eco/tests/java/org/apache/heron/eco/builder/storm/StormStreamBuilderTest.java
+++ b/eco/tests/java/org/apache/heron/eco/builder/storm/StormStreamBuilderTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.builder.storm;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/eco/tests/java/org/apache/heron/eco/parser/EcoParserTest.java b/eco/tests/java/org/apache/heron/eco/parser/EcoParserTest.java
index d0a60eb..9e665b7 100644
--- a/eco/tests/java/org/apache/heron/eco/parser/EcoParserTest.java
+++ b/eco/tests/java/org/apache/heron/eco/parser/EcoParserTest.java
@@ -1,127 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
-package org.apache.heron.eco.parser;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.powermock.api.mockito.PowerMockito;
-
-import org.apache.heron.eco.definition.BeanDefinition;
-import org.apache.heron.eco.definition.BeanReference;
-import org.apache.heron.eco.definition.BoltDefinition;
-import org.apache.heron.eco.definition.EcoTopologyDefinition;
-import org.apache.heron.eco.definition.GroupingDefinition;
-import org.apache.heron.eco.definition.PropertyDefinition;
-import org.apache.heron.eco.definition.StreamDefinition;
-
-import static junit.framework.TestCase.assertNotNull;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-
-
 /**
- * Unit tests for {@link EcoParser}
+ * 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.
  */
-public class EcoParserTest {
-
-
-  private static final String BOLT_1 = "bolt-1";
-  private static final String BOLT_2 = "bolt-2";
-  private static final String YAML_NO_CONFIG_STR = "# Licensed to the Apache Software Foundation"
-      + " (ASF) under one\n"
-      + "# or more contributor license agreements.  See the NOTICE file\n"
-      + "# distributed with this work for additional information\n"
-      + "# regarding copyright ownership.  The ASF licenses this file\n"
-      + "# to you under the Apache License, Version 2.0 (the\n"
-      + "# \"License\"); you may not use this file except in compliance\n"
-      + "# with the License.  You may obtain a copy of the License at\n"
-      + "#\n"
-      + "# http://www.apache.org/licenses/LICENSE-2.0\n"
-      + "#\n"
-      + "# Unless required by applicable law or agreed to in writing, software\n"
-      + "# distributed under the License is distributed on an \"AS IS\" BASIS,\n"
-      + "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
-      + "# See the License for the specific language governing permissions and\n"
-      + "# limitations under the License.\n"
-      + "\n"
-      + "---\n"
-      + "\n"
-      + "# topology definition\n"
-      + "# name to be used when submitting\n"
-      + "name: \"yaml-topology\"\n"
-      + "\n"
-      + "# topology configuration\n"
-      + "# this will be passed to the submitter as a map of config options\n"
-      + "#\n"
-      + "# spout definitions\n"
-      + "spouts:\n"
-      + "  - id: \"spout-1\"\n"
-      + "    className: \"org.apache.heron.sample.TestWordSpout\"\n"
-      + "    parallelism: 1\n"
-      + "\n"
-      + "# bolt definitions\n"
-      + "bolts:\n"
-      + "  - id: \"bolt-1\"\n"
-      + "    className: \"org.apache.heron.sample.TestWordCounter\"\n"
-      + "    parallelism: 2\n"
-      + "\n"
-      + "  - id: \"bolt-2\"\n"
-      + "    className: \"org.apache.heron.sample.LogInfoBolt\"\n"
-      + "    parallelism: 1\n"
-      + "\n"
-      + "#stream definitions\n"
-      + "# stream definitions define connections between spouts and bolts.\n"
-      + "# note that such connections can be cyclical\n"
-      + "streams:\n"
-      + "  - name: \"spout-1 --> bolt-1\" # name isn't used (placeholder for logging, UI, etc.)\n"
-      + "    id: \"connection-1\"\n"
-      + "    from: \"spout-1\"\n"
-      + "    to: \"bolt-1\"\n"
-      + "    grouping:\n"
-      + "      type: FIELDS\n"
-      + "      args: [\"word\"]\n"
-      + "\n"
-      + "  - name: \"bolt-1 --> bolt2\"\n"
-      + "    id: \"connection-2\"\n"
-      + "    from: \"bolt-1\"\n"
-      + "    to: \"bolt-2\"\n"
-      + "    grouping:\n"
-      + "      type: SHUFFLE";
-  private static final String YAML_STR = "# Licensed to the Apache Software Foundation"
-      + " (ASF) under one\n"
-      + "# or more contributor license agreements.  See the NOTICE file\n"
-      + "# distributed with this work for additional information\n"
-      + "# regarding copyright ownership.  The ASF licenses this file\n"
-      + "# to you under the Apache License, Version 2.0 (the\n"
-      + "# \"License\"); you may not use this file except in compliance\n"
-      + "# with the License.  You may obtain a copy of the License at\n"
-      + "#\n"
-      + "# http://www.apache.org/licenses/LICENSE-2.0\n"
-      + "#\n"
-      + "# Unless required by applicable law or agreed to in writing, software\n"
-      + "# distributed under the License is distributed on an \"AS IS\" BASIS,\n"
-      + "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
-      + "# See the License for the specific language governing permissions and\n"
-      + "# limitations under the License.\n"
+\n"
       + "\n"
       + "---\n"
       + "\n"
diff --git a/eco/tests/java/org/apache/heron/eco/submit/EcoSubmitterTest.java b/eco/tests/java/org/apache/heron/eco/submit/EcoSubmitterTest.java
index 1b7bf82..c386f60 100644
--- a/eco/tests/java/org/apache/heron/eco/submit/EcoSubmitterTest.java
+++ b/eco/tests/java/org/apache/heron/eco/submit/EcoSubmitterTest.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.eco.submit;
 
 import org.junit.Before;
diff --git a/examples/src/java/org/apache/heron/examples/api/AckingTopology.java b/examples/src/java/org/apache/heron/examples/api/AckingTopology.java
index f7893b0..23217bf 100644
--- a/examples/src/java/org/apache/heron/examples/api/AckingTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/AckingTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/ComponentJVMOptionsTopology.java b/examples/src/java/org/apache/heron/examples/api/ComponentJVMOptionsTopology.java
index 9dec82f..a65e825 100644
--- a/examples/src/java/org/apache/heron/examples/api/ComponentJVMOptionsTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/ComponentJVMOptionsTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/CustomGroupingTopology.java b/examples/src/java/org/apache/heron/examples/api/CustomGroupingTopology.java
index 64ea6fa..4016ee2 100644
--- a/examples/src/java/org/apache/heron/examples/api/CustomGroupingTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/CustomGroupingTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/ExampleResources.java b/examples/src/java/org/apache/heron/examples/api/ExampleResources.java
index f116237..c5c66a4 100644
--- a/examples/src/java/org/apache/heron/examples/api/ExampleResources.java
+++ b/examples/src/java/org/apache/heron/examples/api/ExampleResources.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.api;
 
 import org.apache.heron.common.basics.ByteAmount;
diff --git a/examples/src/java/org/apache/heron/examples/api/ExclamationTopology.java b/examples/src/java/org/apache/heron/examples/api/ExclamationTopology.java
index 58e9caf..363c71c 100644
--- a/examples/src/java/org/apache/heron/examples/api/ExclamationTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/ExclamationTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/MultiSpoutExclamationTopology.java b/examples/src/java/org/apache/heron/examples/api/MultiSpoutExclamationTopology.java
index cc01975..e9cdf8a 100644
--- a/examples/src/java/org/apache/heron/examples/api/MultiSpoutExclamationTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/MultiSpoutExclamationTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/MultiStageAckingTopology.java b/examples/src/java/org/apache/heron/examples/api/MultiStageAckingTopology.java
index 7869ae0..a9bff79 100644
--- a/examples/src/java/org/apache/heron/examples/api/MultiStageAckingTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/MultiStageAckingTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/SentenceWordCountTopology.java b/examples/src/java/org/apache/heron/examples/api/SentenceWordCountTopology.java
index aed15c0..8f8ae2c 100644
--- a/examples/src/java/org/apache/heron/examples/api/SentenceWordCountTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/SentenceWordCountTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/SlidingWindowTopology.java b/examples/src/java/org/apache/heron/examples/api/SlidingWindowTopology.java
index fdb87d4..9f5522c 100644
--- a/examples/src/java/org/apache/heron/examples/api/SlidingWindowTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/SlidingWindowTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/StatefulSlidingWindowTopology.java b/examples/src/java/org/apache/heron/examples/api/StatefulSlidingWindowTopology.java
index 062bf1f..9b069c1 100644
--- a/examples/src/java/org/apache/heron/examples/api/StatefulSlidingWindowTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/StatefulSlidingWindowTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/StatefulWordCountTopology.java b/examples/src/java/org/apache/heron/examples/api/StatefulWordCountTopology.java
index 812f711..6208727 100644
--- a/examples/src/java/org/apache/heron/examples/api/StatefulWordCountTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/StatefulWordCountTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/TaskHookTopology.java b/examples/src/java/org/apache/heron/examples/api/TaskHookTopology.java
index 19c31af..33047e9 100644
--- a/examples/src/java/org/apache/heron/examples/api/TaskHookTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/TaskHookTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/WindowedWordCountTopology.java b/examples/src/java/org/apache/heron/examples/api/WindowedWordCountTopology.java
index 3132608..e237e6c 100644
--- a/examples/src/java/org/apache/heron/examples/api/WindowedWordCountTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/WindowedWordCountTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.api;
 
 import java.util.HashMap;
diff --git a/examples/src/java/org/apache/heron/examples/api/WordCountTopology.java b/examples/src/java/org/apache/heron/examples/api/WordCountTopology.java
index 2b8ecb3..0a919d8 100644
--- a/examples/src/java/org/apache/heron/examples/api/WordCountTopology.java
+++ b/examples/src/java/org/apache/heron/examples/api/WordCountTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api;
 
diff --git a/examples/src/java/org/apache/heron/examples/api/bolt/PrinterBolt.java b/examples/src/java/org/apache/heron/examples/api/bolt/PrinterBolt.java
index 21e9852..c685d3c 100644
--- a/examples/src/java/org/apache/heron/examples/api/bolt/PrinterBolt.java
+++ b/examples/src/java/org/apache/heron/examples/api/bolt/PrinterBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.api.bolt;
 
 import org.apache.heron.api.bolt.BaseBasicBolt;
diff --git a/examples/src/java/org/apache/heron/examples/api/bolt/SlidingWindowSumBolt.java b/examples/src/java/org/apache/heron/examples/api/bolt/SlidingWindowSumBolt.java
index e3e6c67..5db8911 100644
--- a/examples/src/java/org/apache/heron/examples/api/bolt/SlidingWindowSumBolt.java
+++ b/examples/src/java/org/apache/heron/examples/api/bolt/SlidingWindowSumBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.api.bolt;
 
 import java.util.List;
diff --git a/examples/src/java/org/apache/heron/examples/api/spout/RandomIntegerSpout.java b/examples/src/java/org/apache/heron/examples/api/spout/RandomIntegerSpout.java
index 7a82461..5e503c1 100644
--- a/examples/src/java/org/apache/heron/examples/api/spout/RandomIntegerSpout.java
+++ b/examples/src/java/org/apache/heron/examples/api/spout/RandomIntegerSpout.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.examples.api.spout;
 
 import java.util.Map;
diff --git a/examples/src/java/org/apache/heron/examples/api/spout/TestWordSpout.java b/examples/src/java/org/apache/heron/examples/api/spout/TestWordSpout.java
index e88243e..e229d5b 100644
--- a/examples/src/java/org/apache/heron/examples/api/spout/TestWordSpout.java
+++ b/examples/src/java/org/apache/heron/examples/api/spout/TestWordSpout.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.api.spout;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/FilesystemSinkTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/FilesystemSinkTopology.java
index cd3c3ea..a0e8c31 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/FilesystemSinkTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/FilesystemSinkTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/FormattedOutputTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/FormattedOutputTopology.java
index 0e63ae5..cf4e908 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/FormattedOutputTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/FormattedOutputTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/ImpressionsAndClicksTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/ImpressionsAndClicksTopology.java
index df6c633..34184c9 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/ImpressionsAndClicksTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/ImpressionsAndClicksTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/IntegerProcessingTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/IntegerProcessingTopology.java
index 71d9e77..453ee88 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/IntegerProcessingTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/IntegerProcessingTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/RepartitionTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/RepartitionTopology.java
index 5bddc11..f99cfd2 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/RepartitionTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/RepartitionTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/SimplePulsarSourceTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/SimplePulsarSourceTopology.java
index ca27a13..e2a852c 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/SimplePulsarSourceTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/SimplePulsarSourceTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/SmartWatchTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/SmartWatchTopology.java
index 7e38932..b82ad16 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/SmartWatchTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/SmartWatchTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/StreamletCloneTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/StreamletCloneTopology.java
index 724e17e..843da57 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/StreamletCloneTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/StreamletCloneTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/TransformsTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/TransformsTopology.java
index 40b4b05..2a21a5e 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/TransformsTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/TransformsTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/WindowedWordCountTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/WindowedWordCountTopology.java
index 63e9be7..bce855c 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/WindowedWordCountTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/WindowedWordCountTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/WireRequestsTopology.java b/examples/src/java/org/apache/heron/examples/streamlet/WireRequestsTopology.java
index 1e0fa77..6318982 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/WireRequestsTopology.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/WireRequestsTopology.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet;
 
diff --git a/examples/src/java/org/apache/heron/examples/streamlet/utils/StreamletUtils.java b/examples/src/java/org/apache/heron/examples/streamlet/utils/StreamletUtils.java
index bde0ba4..7feac09 100644
--- a/examples/src/java/org/apache/heron/examples/streamlet/utils/StreamletUtils.java
+++ b/examples/src/java/org/apache/heron/examples/streamlet/utils/StreamletUtils.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.examples.streamlet.utils;
 
diff --git a/heron/api/src/java/org/apache/heron/api/Config.java b/heron/api/src/java/org/apache/heron/api/Config.java
index c6f7c39..f1495d4 100644
--- a/heron/api/src/java/org/apache/heron/api/Config.java
+++ b/heron/api/src/java/org/apache/heron/api/Config.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api;
 
 import java.nio.charset.StandardCharsets;
diff --git a/heron/api/src/java/org/apache/heron/api/Constants.java b/heron/api/src/java/org/apache/heron/api/Constants.java
index da2c98f..013b770 100644
--- a/heron/api/src/java/org/apache/heron/api/Constants.java
+++ b/heron/api/src/java/org/apache/heron/api/Constants.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api;
diff --git a/heron/api/src/java/org/apache/heron/api/HeronSubmitter.java b/heron/api/src/java/org/apache/heron/api/HeronSubmitter.java
index 41eb13a..3897102 100644
--- a/heron/api/src/java/org/apache/heron/api/HeronSubmitter.java
+++ b/heron/api/src/java/org/apache/heron/api/HeronSubmitter.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api;
diff --git a/heron/api/src/java/org/apache/heron/api/HeronTopology.java b/heron/api/src/java/org/apache/heron/api/HeronTopology.java
index 1ebc82c..e0aaeff 100644
--- a/heron/api/src/java/org/apache/heron/api/HeronTopology.java
+++ b/heron/api/src/java/org/apache/heron/api/HeronTopology.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/Pair.java b/heron/api/src/java/org/apache/heron/api/Pair.java
index 24f21d4..675a0be 100644
--- a/heron/api/src/java/org/apache/heron/api/Pair.java
+++ b/heron/api/src/java/org/apache/heron/api/Pair.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/BaseBasicBolt.java b/heron/api/src/java/org/apache/heron/api/bolt/BaseBasicBolt.java
index 96d9623..fb47ff3 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/BaseBasicBolt.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/BaseBasicBolt.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/BaseRichBolt.java b/heron/api/src/java/org/apache/heron/api/bolt/BaseRichBolt.java
index b2545ce..0d2afda 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/BaseRichBolt.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/BaseRichBolt.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 import org.apache.heron.api.topology.BaseComponent;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/BaseStatefulWindowedBolt.java b/heron/api/src/java/org/apache/heron/api/bolt/BaseStatefulWindowedBolt.java
index 81f786d..4d29285 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/BaseStatefulWindowedBolt.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/BaseStatefulWindowedBolt.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 package org.apache.heron.api.bolt;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/BaseWindowedBolt.java b/heron/api/src/java/org/apache/heron/api/bolt/BaseWindowedBolt.java
index 7bd753c..0fd425c 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/BaseWindowedBolt.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/BaseWindowedBolt.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.bolt;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/BasicBoltExecutor.java b/heron/api/src/java/org/apache/heron/api/bolt/BasicBoltExecutor.java
index ebf7a12..4ca4165 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/BasicBoltExecutor.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/BasicBoltExecutor.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/BasicOutputCollector.java b/heron/api/src/java/org/apache/heron/api/bolt/BasicOutputCollector.java
index 83cfc31..54a66a8 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/BasicOutputCollector.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/BasicOutputCollector.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 import java.util.List;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/IBasicBolt.java b/heron/api/src/java/org/apache/heron/api/bolt/IBasicBolt.java
index 24270d3..3e685fb 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/IBasicBolt.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/IBasicBolt.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/IBasicOutputCollector.java b/heron/api/src/java/org/apache/heron/api/bolt/IBasicOutputCollector.java
index 2037194..253410a 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/IBasicOutputCollector.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/IBasicOutputCollector.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 import java.util.List;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/IBolt.java b/heron/api/src/java/org/apache/heron/api/bolt/IBolt.java
index a7d743b..f294997 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/IBolt.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/IBolt.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/IErrorReporter.java b/heron/api/src/java/org/apache/heron/api/bolt/IErrorReporter.java
index f44f22c..eef0e0f 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/IErrorReporter.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/IErrorReporter.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 public interface IErrorReporter {
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/IOutputCollector.java b/heron/api/src/java/org/apache/heron/api/bolt/IOutputCollector.java
index 7d5a6fc..b3d52a3 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/IOutputCollector.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/IOutputCollector.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 import java.util.Collection;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/IRichBolt.java b/heron/api/src/java/org/apache/heron/api/bolt/IRichBolt.java
index 8fa2c3b..98b50f9 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/IRichBolt.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/IRichBolt.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 import org.apache.heron.api.topology.IComponent;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/IStatefulWindowedBolt.java b/heron/api/src/java/org/apache/heron/api/bolt/IStatefulWindowedBolt.java
index 6ecc2ff..6864fe7 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/IStatefulWindowedBolt.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/IStatefulWindowedBolt.java
@@ -1,16 +1,21 @@
-// Copyright 2016 Twitter. All rights reserved.
-//
-// Licensed 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.
+/**
+ * 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.
+ */
 
 package org.apache.heron.api.bolt;
 
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/IWindowedBolt.java b/heron/api/src/java/org/apache/heron/api/bolt/IWindowedBolt.java
index 62db8f2..9e4de7e 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/IWindowedBolt.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/IWindowedBolt.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.bolt;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/OutputCollector.java b/heron/api/src/java/org/apache/heron/api/bolt/OutputCollector.java
index 3228b9a..59351a1 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/OutputCollector.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/OutputCollector.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.bolt;
 
 import java.util.Arrays;
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/StatefulWindowedBoltExecutor.java b/heron/api/src/java/org/apache/heron/api/bolt/StatefulWindowedBoltExecutor.java
index 4abf141..d63acba 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/StatefulWindowedBoltExecutor.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/StatefulWindowedBoltExecutor.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.api.bolt;
 
diff --git a/heron/api/src/java/org/apache/heron/api/bolt/WindowedBoltExecutor.java b/heron/api/src/java/org/apache/heron/api/bolt/WindowedBoltExecutor.java
index c96f96a..1789fb3 100644
--- a/heron/api/src/java/org/apache/heron/api/bolt/WindowedBoltExecutor.java
+++ b/heron/api/src/java/org/apache/heron/api/bolt/WindowedBoltExecutor.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.bolt;
diff --git a/heron/api/src/java/org/apache/heron/api/exception/AlreadyAliveException.java b/heron/api/src/java/org/apache/heron/api/exception/AlreadyAliveException.java
index 6fbdd07..de078e7 100644
--- a/heron/api/src/java/org/apache/heron/api/exception/AlreadyAliveException.java
+++ b/heron/api/src/java/org/apache/heron/api/exception/AlreadyAliveException.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.exception;
 
 public class AlreadyAliveException extends Exception {
diff --git a/heron/api/src/java/org/apache/heron/api/exception/FailedException.java b/heron/api/src/java/org/apache/heron/api/exception/FailedException.java
index aa9cd72..c5b7efa 100644
--- a/heron/api/src/java/org/apache/heron/api/exception/FailedException.java
+++ b/heron/api/src/java/org/apache/heron/api/exception/FailedException.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.exception;
 
 public class FailedException extends RuntimeException {
diff --git a/heron/api/src/java/org/apache/heron/api/exception/InvalidTopologyException.java b/heron/api/src/java/org/apache/heron/api/exception/InvalidTopologyException.java
index a022ed7..57921c1 100644
--- a/heron/api/src/java/org/apache/heron/api/exception/InvalidTopologyException.java
+++ b/heron/api/src/java/org/apache/heron/api/exception/InvalidTopologyException.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.exception;
 
 public class InvalidTopologyException extends Exception {
diff --git a/heron/api/src/java/org/apache/heron/api/exception/ReportedFailedException.java b/heron/api/src/java/org/apache/heron/api/exception/ReportedFailedException.java
index 603b57c..c17b1eb 100644
--- a/heron/api/src/java/org/apache/heron/api/exception/ReportedFailedException.java
+++ b/heron/api/src/java/org/apache/heron/api/exception/ReportedFailedException.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.exception;
 
 public class ReportedFailedException extends FailedException {
diff --git a/heron/api/src/java/org/apache/heron/api/exception/TopologySubmissionException.java b/heron/api/src/java/org/apache/heron/api/exception/TopologySubmissionException.java
index 78d49a7..28cb4f3 100644
--- a/heron/api/src/java/org/apache/heron/api/exception/TopologySubmissionException.java
+++ b/heron/api/src/java/org/apache/heron/api/exception/TopologySubmissionException.java
@@ -1,16 +1,22 @@
-//  Copyright 2018 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.api.exception;
 
diff --git a/heron/api/src/java/org/apache/heron/api/grouping/CustomStreamGrouping.java b/heron/api/src/java/org/apache/heron/api/grouping/CustomStreamGrouping.java
index 01f6d8a..627c385 100644
--- a/heron/api/src/java/org/apache/heron/api/grouping/CustomStreamGrouping.java
+++ b/heron/api/src/java/org/apache/heron/api/grouping/CustomStreamGrouping.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.grouping;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/hooks/BaseTaskHook.java b/heron/api/src/java/org/apache/heron/api/hooks/BaseTaskHook.java
index 99d4826..76aea06 100644
--- a/heron/api/src/java/org/apache/heron/api/hooks/BaseTaskHook.java
+++ b/heron/api/src/java/org/apache/heron/api/hooks/BaseTaskHook.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.hooks;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/hooks/ITaskHook.java b/heron/api/src/java/org/apache/heron/api/hooks/ITaskHook.java
index c3f4fdb..9573f41 100644
--- a/heron/api/src/java/org/apache/heron/api/hooks/ITaskHook.java
+++ b/heron/api/src/java/org/apache/heron/api/hooks/ITaskHook.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.hooks;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/hooks/info/BoltAckInfo.java b/heron/api/src/java/org/apache/heron/api/hooks/info/BoltAckInfo.java
index 19f1ba5..57169f2 100644
--- a/heron/api/src/java/org/apache/heron/api/hooks/info/BoltAckInfo.java
+++ b/heron/api/src/java/org/apache/heron/api/hooks/info/BoltAckInfo.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.hooks.info;
 
 import java.time.Duration;
diff --git a/heron/api/src/java/org/apache/heron/api/hooks/info/BoltExecuteInfo.java b/heron/api/src/java/org/apache/heron/api/hooks/info/BoltExecuteInfo.java
index 65c53a8..1efcbae 100644
--- a/heron/api/src/java/org/apache/heron/api/hooks/info/BoltExecuteInfo.java
+++ b/heron/api/src/java/org/apache/heron/api/hooks/info/BoltExecuteInfo.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.hooks.info;
 
 import java.time.Duration;
diff --git a/heron/api/src/java/org/apache/heron/api/hooks/info/BoltFailInfo.java b/heron/api/src/java/org/apache/heron/api/hooks/info/BoltFailInfo.java
index 1c258be..8b5aaa3 100644
--- a/heron/api/src/java/org/apache/heron/api/hooks/info/BoltFailInfo.java
+++ b/heron/api/src/java/org/apache/heron/api/hooks/info/BoltFailInfo.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.hooks.info;
 
 import java.time.Duration;
diff --git a/heron/api/src/java/org/apache/heron/api/hooks/info/EmitInfo.java b/heron/api/src/java/org/apache/heron/api/hooks/info/EmitInfo.java
index 1413e6a..7370be5 100644
--- a/heron/api/src/java/org/apache/heron/api/hooks/info/EmitInfo.java
+++ b/heron/api/src/java/org/apache/heron/api/hooks/info/EmitInfo.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.hooks.info;
 
 import java.util.Collection;
diff --git a/heron/api/src/java/org/apache/heron/api/hooks/info/SpoutAckInfo.java b/heron/api/src/java/org/apache/heron/api/hooks/info/SpoutAckInfo.java
index 9ebe0d4..36c6d1c 100644
--- a/heron/api/src/java/org/apache/heron/api/hooks/info/SpoutAckInfo.java
+++ b/heron/api/src/java/org/apache/heron/api/hooks/info/SpoutAckInfo.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.hooks.info;
 
 import java.time.Duration;
diff --git a/heron/api/src/java/org/apache/heron/api/hooks/info/SpoutFailInfo.java b/heron/api/src/java/org/apache/heron/api/hooks/info/SpoutFailInfo.java
index cab24c7..0e4839e 100644
--- a/heron/api/src/java/org/apache/heron/api/hooks/info/SpoutFailInfo.java
+++ b/heron/api/src/java/org/apache/heron/api/hooks/info/SpoutFailInfo.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.hooks.info;
 
 import java.time.Duration;
diff --git a/heron/api/src/java/org/apache/heron/api/metric/AssignableMetric.java b/heron/api/src/java/org/apache/heron/api/metric/AssignableMetric.java
index 228f67b..017697d 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/AssignableMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/AssignableMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 public class AssignableMetric<T> implements IMetric<T> {
diff --git a/heron/api/src/java/org/apache/heron/api/metric/CombinedMetric.java b/heron/api/src/java/org/apache/heron/api/metric/CombinedMetric.java
index 62fffb7..3433880 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/CombinedMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/CombinedMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 public class CombinedMetric<T> implements IMetric<T> {
diff --git a/heron/api/src/java/org/apache/heron/api/metric/ConcurrentCountMetric.java b/heron/api/src/java/org/apache/heron/api/metric/ConcurrentCountMetric.java
index 4d94be3..0114cc1 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/ConcurrentCountMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/ConcurrentCountMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 // A thread safe count metric
diff --git a/heron/api/src/java/org/apache/heron/api/metric/CountMetric.java b/heron/api/src/java/org/apache/heron/api/metric/CountMetric.java
index 6c78ef6..355a7ff 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/CountMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/CountMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 public class CountMetric implements IMetric<Long> {
diff --git a/heron/api/src/java/org/apache/heron/api/metric/CountStatAndMetric.java b/heron/api/src/java/org/apache/heron/api/metric/CountStatAndMetric.java
index 54d6bb4..2723154 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/CountStatAndMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/CountStatAndMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 import java.util.HashMap;
diff --git a/heron/api/src/java/org/apache/heron/api/metric/GlobalMetrics.java b/heron/api/src/java/org/apache/heron/api/metric/GlobalMetrics.java
index e951431..9943319 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/GlobalMetrics.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/GlobalMetrics.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/metric/ICombiner.java b/heron/api/src/java/org/apache/heron/api/metric/ICombiner.java
index c5019f4..42bee4e 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/ICombiner.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/ICombiner.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 /**
diff --git a/heron/api/src/java/org/apache/heron/api/metric/IMetric.java b/heron/api/src/java/org/apache/heron/api/metric/IMetric.java
index f95d0a8..ae26a38 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/IMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/IMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 /**
diff --git a/heron/api/src/java/org/apache/heron/api/metric/IMetricsRegister.java b/heron/api/src/java/org/apache/heron/api/metric/IMetricsRegister.java
index 3d0dcae..01728c4 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/IMetricsRegister.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/IMetricsRegister.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 
diff --git a/heron/api/src/java/org/apache/heron/api/metric/IReducer.java b/heron/api/src/java/org/apache/heron/api/metric/IReducer.java
index 94d1407..cdf75c6 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/IReducer.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/IReducer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 /**
diff --git a/heron/api/src/java/org/apache/heron/api/metric/LatencyStatAndMetric.java b/heron/api/src/java/org/apache/heron/api/metric/LatencyStatAndMetric.java
index aeb0027..8031255 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/LatencyStatAndMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/LatencyStatAndMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.metric;
diff --git a/heron/api/src/java/org/apache/heron/api/metric/MeanReducer.java b/heron/api/src/java/org/apache/heron/api/metric/MeanReducer.java
index 3107750..044f1af 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/MeanReducer.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/MeanReducer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 public class MeanReducer implements IReducer<MeanReducerState, Number, Double> {
diff --git a/heron/api/src/java/org/apache/heron/api/metric/MeanReducerState.java b/heron/api/src/java/org/apache/heron/api/metric/MeanReducerState.java
index cdff3c3..51acb88 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/MeanReducerState.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/MeanReducerState.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 public class MeanReducerState {
diff --git a/heron/api/src/java/org/apache/heron/api/metric/MetricStatTimer.java b/heron/api/src/java/org/apache/heron/api/metric/MetricStatTimer.java
index dfc5c55..0061fef 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/MetricStatTimer.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/MetricStatTimer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 import java.util.Timer;
diff --git a/heron/api/src/java/org/apache/heron/api/metric/MultiAssignableMetric.java b/heron/api/src/java/org/apache/heron/api/metric/MultiAssignableMetric.java
index 354606e..d00a93c 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/MultiAssignableMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/MultiAssignableMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 import java.util.HashMap;
diff --git a/heron/api/src/java/org/apache/heron/api/metric/MultiCountMetric.java b/heron/api/src/java/org/apache/heron/api/metric/MultiCountMetric.java
index 95fe393..2f2fee0 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/MultiCountMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/MultiCountMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 import java.util.HashMap;
diff --git a/heron/api/src/java/org/apache/heron/api/metric/MultiReducedMetric.java b/heron/api/src/java/org/apache/heron/api/metric/MultiReducedMetric.java
index 2d0e396..9512793 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/MultiReducedMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/MultiReducedMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 import java.util.HashMap;
diff --git a/heron/api/src/java/org/apache/heron/api/metric/ReducedMetric.java b/heron/api/src/java/org/apache/heron/api/metric/ReducedMetric.java
index a1054d4..64d45ec 100644
--- a/heron/api/src/java/org/apache/heron/api/metric/ReducedMetric.java
+++ b/heron/api/src/java/org/apache/heron/api/metric/ReducedMetric.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.metric;
 
 /**
diff --git a/heron/api/src/java/org/apache/heron/api/serializer/IPluggableSerializer.java b/heron/api/src/java/org/apache/heron/api/serializer/IPluggableSerializer.java
index d9773e8..c61dae8 100644
--- a/heron/api/src/java/org/apache/heron/api/serializer/IPluggableSerializer.java
+++ b/heron/api/src/java/org/apache/heron/api/serializer/IPluggableSerializer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.serializer;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/serializer/JavaSerializer.java b/heron/api/src/java/org/apache/heron/api/serializer/JavaSerializer.java
index 9c89e16..79a5d61 100644
--- a/heron/api/src/java/org/apache/heron/api/serializer/JavaSerializer.java
+++ b/heron/api/src/java/org/apache/heron/api/serializer/JavaSerializer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.serializer;
 
 import java.io.ByteArrayInputStream;
diff --git a/heron/api/src/java/org/apache/heron/api/spout/BaseRichSpout.java b/heron/api/src/java/org/apache/heron/api/spout/BaseRichSpout.java
index 01c545e..dd04c30 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/BaseRichSpout.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/BaseRichSpout.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 import org.apache.heron.api.topology.BaseComponent;
diff --git a/heron/api/src/java/org/apache/heron/api/spout/IMultiSchemableSpout.java b/heron/api/src/java/org/apache/heron/api/spout/IMultiSchemableSpout.java
index 9d8ce99..2e532df 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/IMultiSchemableSpout.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/IMultiSchemableSpout.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 public interface IMultiSchemableSpout {
diff --git a/heron/api/src/java/org/apache/heron/api/spout/IRichSpout.java b/heron/api/src/java/org/apache/heron/api/spout/IRichSpout.java
index 5718a66..831be22 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/IRichSpout.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/IRichSpout.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 import org.apache.heron.api.topology.IComponent;
diff --git a/heron/api/src/java/org/apache/heron/api/spout/ISchemableSpout.java b/heron/api/src/java/org/apache/heron/api/spout/ISchemableSpout.java
index bd5dab9..a28fe99 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/ISchemableSpout.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/ISchemableSpout.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 
diff --git a/heron/api/src/java/org/apache/heron/api/spout/ISpout.java b/heron/api/src/java/org/apache/heron/api/spout/ISpout.java
index 0de99fc..9c603aa 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/ISpout.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/ISpout.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/spout/ISpoutOutputCollector.java b/heron/api/src/java/org/apache/heron/api/spout/ISpoutOutputCollector.java
index d64adbc..c274ec7 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/ISpoutOutputCollector.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/ISpoutOutputCollector.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 import java.util.List;
diff --git a/heron/api/src/java/org/apache/heron/api/spout/MultiScheme.java b/heron/api/src/java/org/apache/heron/api/spout/MultiScheme.java
index 62dfb2c..f254a0a 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/MultiScheme.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/MultiScheme.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/spout/RawMultiScheme.java b/heron/api/src/java/org/apache/heron/api/spout/RawMultiScheme.java
index acf58e4..864531f 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/RawMultiScheme.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/RawMultiScheme.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 import java.util.List;
diff --git a/heron/api/src/java/org/apache/heron/api/spout/RawScheme.java b/heron/api/src/java/org/apache/heron/api/spout/RawScheme.java
index ea9a728..258e3ce 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/RawScheme.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/RawScheme.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 import java.util.List;
diff --git a/heron/api/src/java/org/apache/heron/api/spout/Scheme.java b/heron/api/src/java/org/apache/heron/api/spout/Scheme.java
index db0b792..c972f11 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/Scheme.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/Scheme.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/spout/SchemeAsMultiScheme.java b/heron/api/src/java/org/apache/heron/api/spout/SchemeAsMultiScheme.java
index 62d6a32..b3caa32 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/SchemeAsMultiScheme.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/SchemeAsMultiScheme.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 import java.util.Arrays;
diff --git a/heron/api/src/java/org/apache/heron/api/spout/SpoutOutputCollector.java b/heron/api/src/java/org/apache/heron/api/spout/SpoutOutputCollector.java
index b5f206f..36e8208 100644
--- a/heron/api/src/java/org/apache/heron/api/spout/SpoutOutputCollector.java
+++ b/heron/api/src/java/org/apache/heron/api/spout/SpoutOutputCollector.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.spout;
 
 import java.util.List;
diff --git a/heron/api/src/java/org/apache/heron/api/state/HashMapState.java b/heron/api/src/java/org/apache/heron/api/state/HashMapState.java
index 152e2ee..ea6d052 100644
--- a/heron/api/src/java/org/apache/heron/api/state/HashMapState.java
+++ b/heron/api/src/java/org/apache/heron/api/state/HashMapState.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.state;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/state/State.java b/heron/api/src/java/org/apache/heron/api/state/State.java
index 60bbfe1..44b123a 100644
--- a/heron/api/src/java/org/apache/heron/api/state/State.java
+++ b/heron/api/src/java/org/apache/heron/api/state/State.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.state;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/BaseComponent.java b/heron/api/src/java/org/apache/heron/api/topology/BaseComponent.java
index e171f87..6625abc 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/BaseComponent.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/BaseComponent.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/BaseComponentDeclarer.java b/heron/api/src/java/org/apache/heron/api/topology/BaseComponentDeclarer.java
index 997778c..8f41bbe 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/BaseComponentDeclarer.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/BaseComponentDeclarer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/BaseConfigurationDeclarer.java b/heron/api/src/java/org/apache/heron/api/topology/BaseConfigurationDeclarer.java
index d7d73ef..f5ff9af 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/BaseConfigurationDeclarer.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/BaseConfigurationDeclarer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.util.HashMap;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/BoltDeclarer.java b/heron/api/src/java/org/apache/heron/api/topology/BoltDeclarer.java
index d8352c6..1956e92 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/BoltDeclarer.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/BoltDeclarer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.util.LinkedList;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/ComponentConfigurationDeclarer.java b/heron/api/src/java/org/apache/heron/api/topology/ComponentConfigurationDeclarer.java
index 3774405..1c3b817 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/ComponentConfigurationDeclarer.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/ComponentConfigurationDeclarer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/GeneralTopologyContext.java b/heron/api/src/java/org/apache/heron/api/topology/GeneralTopologyContext.java
index 858532f..6ae0422 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/GeneralTopologyContext.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/GeneralTopologyContext.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.util.List;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/IComponent.java b/heron/api/src/java/org/apache/heron/api/topology/IComponent.java
index 159bd5a..a56618d 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/IComponent.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/IComponent.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/IStatefulComponent.java b/heron/api/src/java/org/apache/heron/api/topology/IStatefulComponent.java
index 4fa3719..7921fa7 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/IStatefulComponent.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/IStatefulComponent.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/IUpdatable.java b/heron/api/src/java/org/apache/heron/api/topology/IUpdatable.java
index 49541d5..9c3e8ae 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/IUpdatable.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/IUpdatable.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.topology;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/OutputFieldsDeclarer.java b/heron/api/src/java/org/apache/heron/api/topology/OutputFieldsDeclarer.java
index f202446..5db66a9 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/OutputFieldsDeclarer.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/OutputFieldsDeclarer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import org.apache.heron.api.tuple.Fields;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/OutputFieldsGetter.java b/heron/api/src/java/org/apache/heron/api/topology/OutputFieldsGetter.java
index c664eb5..84d0498 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/OutputFieldsGetter.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/OutputFieldsGetter.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.util.HashMap;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/SpoutDeclarer.java b/heron/api/src/java/org/apache/heron/api/topology/SpoutDeclarer.java
index 74ed79a..baa9ad4 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/SpoutDeclarer.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/SpoutDeclarer.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.util.Map;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/TopologyBuilder.java b/heron/api/src/java/org/apache/heron/api/topology/TopologyBuilder.java
index e1252b8..2e29086 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/TopologyBuilder.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/TopologyBuilder.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/topology/TopologyContext.java b/heron/api/src/java/org/apache/heron/api/topology/TopologyContext.java
index 00f8db5..7c015ae 100644
--- a/heron/api/src/java/org/apache/heron/api/topology/TopologyContext.java
+++ b/heron/api/src/java/org/apache/heron/api/topology/TopologyContext.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.topology;
 
 import java.util.Collection;
diff --git a/heron/api/src/java/org/apache/heron/api/tuple/Fields.java b/heron/api/src/java/org/apache/heron/api/tuple/Fields.java
index e5c184a..50e9905 100644
--- a/heron/api/src/java/org/apache/heron/api/tuple/Fields.java
+++ b/heron/api/src/java/org/apache/heron/api/tuple/Fields.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.tuple;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/tuple/Tuple.java b/heron/api/src/java/org/apache/heron/api/tuple/Tuple.java
index e033e47..582ee46 100644
--- a/heron/api/src/java/org/apache/heron/api/tuple/Tuple.java
+++ b/heron/api/src/java/org/apache/heron/api/tuple/Tuple.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.tuple;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/tuple/Values.java b/heron/api/src/java/org/apache/heron/api/tuple/Values.java
index 4a57b68..9eae3a7 100644
--- a/heron/api/src/java/org/apache/heron/api/tuple/Values.java
+++ b/heron/api/src/java/org/apache/heron/api/tuple/Values.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.tuple;
 
 import java.util.ArrayList;
diff --git a/heron/api/src/java/org/apache/heron/api/utils/DefaultMaxSpoutPendingTuner.java b/heron/api/src/java/org/apache/heron/api/utils/DefaultMaxSpoutPendingTuner.java
index be239fb..0c047b6 100644
--- a/heron/api/src/java/org/apache/heron/api/utils/DefaultMaxSpoutPendingTuner.java
+++ b/heron/api/src/java/org/apache/heron/api/utils/DefaultMaxSpoutPendingTuner.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.utils;
 
 /**
diff --git a/heron/api/src/java/org/apache/heron/api/utils/TopologyUtils.java b/heron/api/src/java/org/apache/heron/api/utils/TopologyUtils.java
index 5b36d5d..73a709e 100644
--- a/heron/api/src/java/org/apache/heron/api/utils/TopologyUtils.java
+++ b/heron/api/src/java/org/apache/heron/api/utils/TopologyUtils.java
@@ -1,16 +1,22 @@
-//  Copyright 2017 Twitter. All rights reserved.
-//
-//  Licensed 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.
+/**
+ * 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.
+ */
+
 
 package org.apache.heron.api.utils;
 
diff --git a/heron/api/src/java/org/apache/heron/api/utils/TupleUtils.java b/heron/api/src/java/org/apache/heron/api/utils/TupleUtils.java
index f6c058a..7ac9183 100644
--- a/heron/api/src/java/org/apache/heron/api/utils/TupleUtils.java
+++ b/heron/api/src/java/org/apache/heron/api/utils/TupleUtils.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.utils;
diff --git a/heron/api/src/java/org/apache/heron/api/utils/Utils.java b/heron/api/src/java/org/apache/heron/api/utils/Utils.java
index 4927cd2..7a0eab2 100644
--- a/heron/api/src/java/org/apache/heron/api/utils/Utils.java
+++ b/heron/api/src/java/org/apache/heron/api/utils/Utils.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.utils;
 
 import java.io.ByteArrayInputStream;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/DefaultEvictionContext.java b/heron/api/src/java/org/apache/heron/api/windowing/DefaultEvictionContext.java
index 68823b4..0e645c5 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/DefaultEvictionContext.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/DefaultEvictionContext.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/Event.java b/heron/api/src/java/org/apache/heron/api/windowing/Event.java
index dec1c5e..4fe9485 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/Event.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/Event.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/EventImpl.java b/heron/api/src/java/org/apache/heron/api/windowing/EventImpl.java
index a8c50c4..aa9c381 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/EventImpl.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/EventImpl.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/EvictionContext.java b/heron/api/src/java/org/apache/heron/api/windowing/EvictionContext.java
index f472a04..9aeb37d 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/EvictionContext.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/EvictionContext.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/EvictionPolicy.java b/heron/api/src/java/org/apache/heron/api/windowing/EvictionPolicy.java
index 7077ffe..04a9139 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/EvictionPolicy.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/EvictionPolicy.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.windowing;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/TimestampExtractor.java b/heron/api/src/java/org/apache/heron/api/windowing/TimestampExtractor.java
index c43b552..de24df0 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/TimestampExtractor.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/TimestampExtractor.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/TriggerHandler.java b/heron/api/src/java/org/apache/heron/api/windowing/TriggerHandler.java
index 8ff022e..569bbd2 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/TriggerHandler.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/TriggerHandler.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/TriggerPolicy.java b/heron/api/src/java/org/apache/heron/api/windowing/TriggerPolicy.java
index 13e4a15..dff14a7 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/TriggerPolicy.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/TriggerPolicy.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/TupleFieldTimestampExtractor.java b/heron/api/src/java/org/apache/heron/api/windowing/TupleFieldTimestampExtractor.java
index 312c5b3..69c39d4 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/TupleFieldTimestampExtractor.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/TupleFieldTimestampExtractor.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/TupleWindow.java b/heron/api/src/java/org/apache/heron/api/windowing/TupleWindow.java
index 5cc0889..3c8fd86 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/TupleWindow.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/TupleWindow.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/TupleWindowImpl.java b/heron/api/src/java/org/apache/heron/api/windowing/TupleWindowImpl.java
index c5911ac..220abb3 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/TupleWindowImpl.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/TupleWindowImpl.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/WaterMarkEvent.java b/heron/api/src/java/org/apache/heron/api/windowing/WaterMarkEvent.java
index 5742a22..b4489f7 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/WaterMarkEvent.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/WaterMarkEvent.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/WaterMarkEventGenerator.java b/heron/api/src/java/org/apache/heron/api/windowing/WaterMarkEventGenerator.java
index 91d7d73..f0d3b33 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/WaterMarkEventGenerator.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/WaterMarkEventGenerator.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.windowing;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/Window.java b/heron/api/src/java/org/apache/heron/api/windowing/Window.java
index 993ad8f..5f9b788 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/Window.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/Window.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/WindowLifecycleListener.java b/heron/api/src/java/org/apache/heron/api/windowing/WindowLifecycleListener.java
index 22134f7..8ea01e4 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/WindowLifecycleListener.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/WindowLifecycleListener.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/WindowManager.java b/heron/api/src/java/org/apache/heron/api/windowing/WindowManager.java
index 6efdeb0..26c5dce 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/WindowManager.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/WindowManager.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +7,16 @@
  * "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
+ *   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.
+ * 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.
  */
 
-
 package org.apache.heron.api.windowing;
 
 import java.io.Serializable;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/WindowingConfigs.java b/heron/api/src/java/org/apache/heron/api/windowing/WindowingConfigs.java
index 0f3f5ed..ea5383f 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/WindowingConfigs.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/WindowingConfigs.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/evictors/CountEvictionPolicy.java b/heron/api/src/java/org/apache/heron/api/windowing/evictors/CountEvictionPolicy.java
index 6871622..88e81e9 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/evictors/CountEvictionPolicy.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/evictors/CountEvictionPolicy.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing.evictors;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/evictors/TimeEvictionPolicy.java b/heron/api/src/java/org/apache/heron/api/windowing/evictors/TimeEvictionPolicy.java
index af077a6..b1598c4 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/evictors/TimeEvictionPolicy.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/evictors/TimeEvictionPolicy.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing.evictors;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/evictors/WatermarkCountEvictionPolicy.java b/heron/api/src/java/org/apache/heron/api/windowing/evictors/WatermarkCountEvictionPolicy.java
index 3b64c46..94ba2cc 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/evictors/WatermarkCountEvictionPolicy.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/evictors/WatermarkCountEvictionPolicy.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing.evictors;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/evictors/WatermarkTimeEvictionPolicy.java b/heron/api/src/java/org/apache/heron/api/windowing/evictors/WatermarkTimeEvictionPolicy.java
index ceedbb7..74f4ffd 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/evictors/WatermarkTimeEvictionPolicy.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/evictors/WatermarkTimeEvictionPolicy.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing.evictors;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/triggers/AbstractBaseTriggerPolicy.java b/heron/api/src/java/org/apache/heron/api/windowing/triggers/AbstractBaseTriggerPolicy.java
index dcc63d6..f9772dd 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/triggers/AbstractBaseTriggerPolicy.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/triggers/AbstractBaseTriggerPolicy.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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.
+ * 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.
  */
 
 package org.apache.heron.api.windowing.triggers;
diff --git a/heron/api/src/java/org/apache/heron/api/windowing/triggers/CountTriggerPolicy.java b/heron/api/src/java/org/apache/heron/api/windowing/triggers/CountTriggerPolicy.java
index b5a8200..7ede400 100644
--- a/heron/api/src/java/org/apache/heron/api/windowing/triggers/CountTriggerPolicy.java
+++ b/heron/api/src/java/org/apache/heron/api/windowing/triggers/CountTriggerPolicy.java
@@ -1,17 +1,3 @@
-// Copyright 2017 Twitter. All rights reserved.
-//
-// Licensed 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.
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +7,14 @@
  * "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
+ *   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
... 26289 lines suppressed ...

-- 
To stop receiving notification emails like this one, please contact
nlu90@apache.org.