You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by js...@apache.org on 2017/07/04 09:24:15 UTC

[4/4] incubator-livy git commit: LIVY-374. Update and unify all the license header to Apache

LIVY-374. Update and unify all the license header to Apache

This PR aims to update the license header of all the codes to Apache.

This is one task to move to Apache.

Author: jerryshao <ss...@hortonworks.com>

Closes #11 from jerryshao/LIVY-374.


Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/cb5b8aac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/cb5b8aac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/cb5b8aac

Branch: refs/heads/master
Commit: cb5b8aac505db58f17681fa44e875d9f0ac9e66a
Parents: c591fcc
Author: jerryshao <ss...@hortonworks.com>
Authored: Tue Jul 4 17:24:00 2017 +0800
Committer: jerryshao <ss...@hortonworks.com>
Committed: Tue Jul 4 17:24:00 2017 +0800

----------------------------------------------------------------------
 .rat-excludes                                   | 26 +++++++++
 assembly/assembly.xml                           | 16 ++++++
 assembly/pom.xml                                | 15 +++---
 bin/livy-server                                 | 15 +++---
 checkstyle-suppressions.xml                     | 15 +++---
 checkstyle.xml                                  | 15 +++---
 client-common/pom.xml                           | 15 +++---
 .../livy/client/common/AbstractJobHandle.java   | 15 +++---
 .../livy/client/common/BufferUtils.java         | 15 +++---
 .../cloudera/livy/client/common/ClientConf.java | 15 +++---
 .../livy/client/common/HttpMessages.java        | 15 +++---
 .../cloudera/livy/client/common/Serializer.java | 15 +++---
 .../cloudera/livy/client/common/TestUtils.java  | 15 +++---
 .../client/common/TestAbstractJobHandle.java    | 15 +++---
 .../livy/client/common/TestBufferUtils.java     | 15 +++---
 .../livy/client/common/TestClientConf.java      | 15 +++---
 .../livy/client/common/TestHttpMessages.java    | 15 +++---
 .../livy/client/common/TestSerializer.java      | 15 +++---
 .../livy/client/common/TestTestUtils.java       | 15 +++---
 client-http/pom.xml                             | 15 +++---
 .../cloudera/livy/client/http/HttpClient.java   | 15 +++---
 .../livy/client/http/HttpClientFactory.java     | 15 +++---
 .../com/cloudera/livy/client/http/HttpConf.java | 15 +++---
 .../livy/client/http/JobHandleImpl.java         | 15 +++---
 .../livy/client/http/LivyConnection.java        | 15 +++---
 .../livy/client/http/HttpClientSpec.scala       | 15 +++---
 .../livy/client/http/LivyConnectionSpec.scala   | 15 +++---
 conf/livy-env.sh.template                       | 15 +++---
 conf/log4j.properties.template                  | 16 +++---
 core/pom.xml                                    | 15 +++---
 core/scala-2.10/pom.xml                         | 15 +++---
 core/scala-2.11/pom.xml                         | 15 +++---
 .../main/scala/com/cloudera/livy/Logging.scala  | 15 +++---
 .../main/scala/com/cloudera/livy/Utils.scala    | 15 +++---
 .../src/main/scala/com/cloudera/livy/msgs.scala | 15 +++---
 .../scala/com/cloudera/livy/sessions/Kind.scala | 15 +++---
 .../cloudera/livy/sessions/SessionState.scala   | 15 +++---
 .../cloudera/livy/LivyBaseUnitTestSuite.scala   | 15 +++---
 coverage/pom.xml                                | 15 +++---
 dev/livy-shell                                  | 15 ++++++
 dev/spark/bin/spark-submit                      | 15 ++++++
 dev/travis-upload-logs.sh                       | 16 ++++++
 examples/pom.xml                                | 15 +++---
 .../java/com/cloudera/livy/examples/PiApp.java  | 15 +++---
 examples/src/main/python/pi_app.py              | 15 +++---
 .../cloudera/livy/examples/WordCountApp.scala   | 15 +++---
 .../minicluster-dependencies/pom.xml            | 15 +++---
 .../minicluster-dependencies/scala-2.10/pom.xml | 15 +++---
 .../minicluster-dependencies/scala-2.11/pom.xml | 15 +++---
 integration-test/pom.xml                        | 15 +++---
 .../framework/BaseIntegrationTestSuite.scala    | 15 +++---
 .../cloudera/livy/test/framework/Cluster.scala  | 15 +++---
 .../livy/test/framework/LivyRestClient.scala    | 15 +++---
 .../livy/test/framework/MiniCluster.scala       | 15 +++---
 .../livy/test/framework/RealCluster.scala       | 15 +++---
 integration-test/src/test/resources/batch.py    | 15 +++---
 .../src/test/resources/log4j.properties         | 15 +++---
 .../src/test/resources/test_python_api.py       | 15 +++---
 .../scala/com/cloudera/livy/test/BatchIT.scala  | 15 +++---
 .../com/cloudera/livy/test/InteractiveIT.scala  | 15 +++---
 .../scala/com/cloudera/livy/test/JobApiIT.scala | 15 +++---
 .../src/test/spark2/scala/Spark2JobApiIT.scala  | 15 +++---
 pom.xml                                         | 57 ++++++++++----------
 python-api/pom.xml                              | 16 ++++++
 python-api/setup.py                             | 15 +++---
 python-api/src/main/python/livy/__init__.py     | 15 +++---
 python-api/src/main/python/livy/client.py       | 15 +++---
 python-api/src/main/python/livy/job_context.py  | 15 +++---
 python-api/src/main/python/livy/job_handle.py   | 15 +++---
 .../src/test/python/livy-tests/client_test.py   | 15 +++---
 repl/pom.xml                                    | 15 +++---
 repl/scala-2.10/pom.xml                         | 15 +++---
 .../cloudera/livy/repl/SparkInterpreter.scala   | 15 +++---
 .../livy/repl/SparkInterpreterSpec.scala        | 15 +++---
 repl/scala-2.11/pom.xml                         | 15 +++---
 .../cloudera/livy/repl/SparkInterpreter.scala   | 15 +++---
 .../livy/repl/SparkInterpreterSpec.scala        | 15 +++---
 repl/src/main/resources/fake_shell.py           | 17 +++---
 .../livy/repl/AbstractSparkInterpreter.scala    | 15 +++---
 .../cloudera/livy/repl/BypassPySparkJob.scala   | 15 +++---
 .../com/cloudera/livy/repl/Interpreter.scala    | 15 +++---
 .../cloudera/livy/repl/ProcessInterpreter.scala | 15 +++---
 .../livy/repl/PySparkJobProcessor.scala         | 15 +++---
 .../cloudera/livy/repl/PythonInterpreter.scala  | 15 +++---
 .../com/cloudera/livy/repl/ReplDriver.scala     | 15 +++---
 .../scala/com/cloudera/livy/repl/Session.scala  | 15 +++---
 .../livy/repl/SparkContextInitializer.scala     | 15 +++---
 .../cloudera/livy/repl/SparkRInterpreter.scala  | 15 +++---
 .../scala/com/cloudera/livy/repl/package.scala  | 15 +++---
 repl/src/test/resources/log4j.properties        | 15 +++---
 .../livy/repl/BaseInterpreterSpec.scala         | 15 +++---
 .../cloudera/livy/repl/BaseSessionSpec.scala    | 15 +++---
 .../livy/repl/PythonInterpreterSpec.scala       | 15 +++---
 .../cloudera/livy/repl/PythonSessionSpec.scala  | 15 +++---
 .../cloudera/livy/repl/ReplDriverSuite.scala    | 15 +++---
 .../livy/repl/ScalaInterpreterSpec.scala        | 15 +++---
 .../com/cloudera/livy/repl/SessionSpec.scala    | 15 +++---
 .../livy/repl/SparkRInterpreterSpec.scala       | 15 +++---
 .../cloudera/livy/repl/SparkRSessionSpec.scala  | 15 +++---
 .../cloudera/livy/repl/SparkSessionSpec.scala   | 15 +++---
 scala-api/pom.xml                               | 15 +++---
 scala-api/scala-2.10/pom.xml                    | 15 +++---
 scala-api/scala-2.11/pom.xml                    | 15 +++---
 .../livy/scalaapi/LivyScalaClient.scala         | 15 +++---
 .../livy/scalaapi/ScalaJobContext.scala         | 15 +++---
 .../cloudera/livy/scalaapi/ScalaJobHandle.scala | 15 +++---
 .../com/cloudera/livy/scalaapi/package.scala    | 15 +++---
 .../livy/scalaapi/ScalaClientTest.scala         | 15 +++---
 .../livy/scalaapi/ScalaClientTestUtils.scala    | 15 +++---
 .../livy/scalaapi/ScalaJobHandleTest.scala      | 15 +++---
 scala/pom.xml                                   | 15 +++---
 scalastyle.xml                                  | 15 +++---
 server/pom.xml                                  | 15 +++---
 .../livy/server/ui/static/all-sessions.js       | 15 +++---
 .../livy/server/ui/static/batches-table.html    | 15 +++---
 .../cloudera/livy/server/ui/static/livy-ui.css  | 15 +++---
 .../livy/server/ui/static/sessions-table.html   | 15 +++---
 .../main/scala/com/cloudera/livy/LivyConf.scala | 15 +++---
 .../main/scala/com/cloudera/livy/package.scala  | 15 +++---
 .../com/cloudera/livy/server/AccessFilter.scala | 15 +++---
 .../livy/server/ApiVersioningSupport.scala      | 15 +++---
 .../com/cloudera/livy/server/ApiVersions.scala  | 15 +++---
 .../com/cloudera/livy/server/CsrfFilter.scala   | 15 +++---
 .../com/cloudera/livy/server/JsonServlet.scala  | 15 +++---
 .../com/cloudera/livy/server/LivyServer.scala   | 15 +++---
 .../cloudera/livy/server/SessionServlet.scala   | 15 +++---
 .../com/cloudera/livy/server/WebServer.scala    | 15 +++---
 .../livy/server/batch/BatchSession.scala        | 15 +++---
 .../livy/server/batch/BatchSessionServlet.scala | 15 +++---
 .../livy/server/batch/CreateBatchRequest.scala  | 15 +++---
 .../interactive/CreateInteractiveRequest.scala  | 15 +++---
 .../server/interactive/InteractiveSession.scala | 15 +++---
 .../interactive/InteractiveSessionServlet.scala | 15 +++---
 .../server/interactive/SessionHeartbeat.scala   | 15 +++---
 .../server/recovery/BlackholeStateStore.scala   | 15 +++---
 .../server/recovery/FileSystemStateStore.scala  | 15 +++---
 .../livy/server/recovery/SessionStore.scala     | 15 +++---
 .../livy/server/recovery/StateStore.scala       | 15 +++---
 .../server/recovery/ZooKeeperStateStore.scala   | 15 +++---
 .../com/cloudera/livy/server/ui/UIServlet.scala | 15 +++---
 .../com/cloudera/livy/sessions/Session.scala    | 15 +++---
 .../cloudera/livy/sessions/SessionManager.scala | 15 +++---
 .../scala/com/cloudera/livy/utils/Clock.scala   | 15 +++---
 .../livy/utils/LineBufferedProcess.scala        | 15 +++---
 .../livy/utils/LineBufferedStream.scala         | 15 +++---
 .../cloudera/livy/utils/LivySparkUtils.scala    | 15 +++---
 .../com/cloudera/livy/utils/SparkApp.scala      | 15 +++---
 .../com/cloudera/livy/utils/SparkProcApp.scala  | 15 +++---
 .../livy/utils/SparkProcessBuilder.scala        | 15 +++---
 .../com/cloudera/livy/utils/SparkYarnApp.scala  | 15 +++---
 server/src/test/resources/log4j.properties      | 15 +++---
 .../livy/server/ApiVersioningSupportSpec.scala  | 15 +++---
 .../livy/server/BaseJsonServletSpec.scala       | 15 +++---
 .../livy/server/BaseSessionServletSpec.scala    | 15 +++---
 .../cloudera/livy/server/JsonServletSpec.scala  | 15 +++---
 .../livy/server/SessionServletSpec.scala        | 15 +++---
 .../livy/server/batch/BatchServletSpec.scala    | 15 +++---
 .../livy/server/batch/BatchSessionSpec.scala    | 15 +++---
 .../server/batch/CreateBatchRequestSpec.scala   | 15 +++---
 .../BaseInteractiveServletSpec.scala            | 15 +++---
 .../CreateInteractiveRequestSpec.scala          | 15 +++---
 .../InteractiveSessionServletSpec.scala         | 15 +++---
 .../interactive/InteractiveSessionSpec.scala    | 15 +++---
 .../livy/server/interactive/JobApiSpec.scala    | 15 +++---
 .../interactive/SessionHeartbeatSpec.scala      | 15 +++---
 .../recovery/BlackholeStateStoreSpec.scala      | 15 +++---
 .../recovery/FileSystemStateStoreSpec.scala     | 15 +++---
 .../livy/server/recovery/SessionStoreSpec.scala | 15 +++---
 .../livy/server/recovery/StateStoreSpec.scala   | 15 +++---
 .../recovery/ZooKeeperStateStoreSpec.scala      | 15 +++---
 .../cloudera/livy/sessions/MockSession.scala    | 15 +++---
 .../livy/sessions/SessionManagerSpec.scala      | 15 +++---
 .../cloudera/livy/sessions/SessionSpec.scala    | 15 +++---
 .../livy/utils/LivySparkUtilsSuite.scala        | 15 +++---
 .../cloudera/livy/utils/SparkYarnAppSpec.scala  | 15 +++---
 test-lib/pom.xml                                | 15 +++---
 .../com/cloudera/livy/test/apps/FailingApp.java | 15 +++---
 .../cloudera/livy/test/apps/SimpleSparkApp.java | 15 +++---
 .../java/com/cloudera/livy/test/jobs/Echo.java  | 15 +++---
 .../com/cloudera/livy/test/jobs/Failure.java    | 15 +++---
 .../com/cloudera/livy/test/jobs/FileReader.java | 15 +++---
 .../cloudera/livy/test/jobs/GetCurrentUser.java | 15 +++---
 .../cloudera/livy/test/jobs/SQLGetTweets.java   | 15 +++---
 .../com/cloudera/livy/test/jobs/Sleeper.java    | 15 +++---
 .../com/cloudera/livy/test/jobs/SmallCount.java | 15 +++---
 .../com/cloudera/livy/test/jobs/VoidJob.java    | 15 +++---
 .../com/cloudera/livy/test/jobs/ScalaEcho.scala | 15 +++---
 .../livy/test/jobs/spark2/DatasetTest.java      | 15 +++---
 .../livy/test/jobs/spark2/SparkSessionTest.java | 15 +++---
 189 files changed, 1410 insertions(+), 1484 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
new file mode 100644
index 0000000..fe6e7ec
--- /dev/null
+++ b/.rat-excludes
@@ -0,0 +1,26 @@
+.rat-excludes
+.travis.yml
+logs/*
+conf/*
+**/*.conf
+**/META-INF/**
+**/*.json
+**/*.md
+*.iml
+**/*.iml
+**/build.marker
+**/dependency-reduced-pom.xml
+**/target/**
+**/bootstrap.min.css
+**/bootstrap.min.js
+**/dataTables.bootstrap.min.css
+**/dataTables.bootstrap.min.js
+**/jquery.dataTables.min.js
+**/jquery-3.2.1.min.js
+**/livy_python_api.egg-info/*
+**/*.txt
+**/MANIFEST.in
+**/setup.cfg
+**/derby.log
+**/metastore_db/**
+**/.eggs/**

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/assembly/assembly.xml b/assembly/assembly.xml
index a49546d..4a0e797 100644
--- a/assembly/assembly.xml
+++ b/assembly/assembly.xml
@@ -1,3 +1,19 @@
+<!--
+  ~ 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.
+-->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 87da4e5..3b7aa6d 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/bin/livy-server
----------------------------------------------------------------------
diff --git a/bin/livy-server b/bin/livy-server
index 79159f4..51d765d 100755
--- a/bin/livy-server
+++ b/bin/livy-server
@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
 
-# Licensed to Cloudera, Inc. under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  Cloudera, Inc. 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
+# 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
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/checkstyle-suppressions.xml
----------------------------------------------------------------------
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 9b64707..4b8f4f2 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/checkstyle.xml
----------------------------------------------------------------------
diff --git a/checkstyle.xml b/checkstyle.xml
index dea48bd..929f739 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/pom.xml
----------------------------------------------------------------------
diff --git a/client-common/pom.xml b/client-common/pom.xml
index e41aaae..cdf48e6 100644
--- a/client-common/pom.xml
+++ b/client-common/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/main/java/com/cloudera/livy/client/common/AbstractJobHandle.java
----------------------------------------------------------------------
diff --git a/client-common/src/main/java/com/cloudera/livy/client/common/AbstractJobHandle.java b/client-common/src/main/java/com/cloudera/livy/client/common/AbstractJobHandle.java
index 63f3097..cb1b4e8 100644
--- a/client-common/src/main/java/com/cloudera/livy/client/common/AbstractJobHandle.java
+++ b/client-common/src/main/java/com/cloudera/livy/client/common/AbstractJobHandle.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/main/java/com/cloudera/livy/client/common/BufferUtils.java
----------------------------------------------------------------------
diff --git a/client-common/src/main/java/com/cloudera/livy/client/common/BufferUtils.java b/client-common/src/main/java/com/cloudera/livy/client/common/BufferUtils.java
index 7370e3e..3084ae5 100644
--- a/client-common/src/main/java/com/cloudera/livy/client/common/BufferUtils.java
+++ b/client-common/src/main/java/com/cloudera/livy/client/common/BufferUtils.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/main/java/com/cloudera/livy/client/common/ClientConf.java
----------------------------------------------------------------------
diff --git a/client-common/src/main/java/com/cloudera/livy/client/common/ClientConf.java b/client-common/src/main/java/com/cloudera/livy/client/common/ClientConf.java
index 4eb7929..035c75e 100644
--- a/client-common/src/main/java/com/cloudera/livy/client/common/ClientConf.java
+++ b/client-common/src/main/java/com/cloudera/livy/client/common/ClientConf.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/main/java/com/cloudera/livy/client/common/HttpMessages.java
----------------------------------------------------------------------
diff --git a/client-common/src/main/java/com/cloudera/livy/client/common/HttpMessages.java b/client-common/src/main/java/com/cloudera/livy/client/common/HttpMessages.java
index df0f331..28a86bf 100644
--- a/client-common/src/main/java/com/cloudera/livy/client/common/HttpMessages.java
+++ b/client-common/src/main/java/com/cloudera/livy/client/common/HttpMessages.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/main/java/com/cloudera/livy/client/common/Serializer.java
----------------------------------------------------------------------
diff --git a/client-common/src/main/java/com/cloudera/livy/client/common/Serializer.java b/client-common/src/main/java/com/cloudera/livy/client/common/Serializer.java
index 459c746..29d82d4 100644
--- a/client-common/src/main/java/com/cloudera/livy/client/common/Serializer.java
+++ b/client-common/src/main/java/com/cloudera/livy/client/common/Serializer.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/main/java/com/cloudera/livy/client/common/TestUtils.java
----------------------------------------------------------------------
diff --git a/client-common/src/main/java/com/cloudera/livy/client/common/TestUtils.java b/client-common/src/main/java/com/cloudera/livy/client/common/TestUtils.java
index 4c1872a..18bb13a 100644
--- a/client-common/src/main/java/com/cloudera/livy/client/common/TestUtils.java
+++ b/client-common/src/main/java/com/cloudera/livy/client/common/TestUtils.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/test/java/com/cloudera/livy/client/common/TestAbstractJobHandle.java
----------------------------------------------------------------------
diff --git a/client-common/src/test/java/com/cloudera/livy/client/common/TestAbstractJobHandle.java b/client-common/src/test/java/com/cloudera/livy/client/common/TestAbstractJobHandle.java
index 93ac350..1b48f07 100644
--- a/client-common/src/test/java/com/cloudera/livy/client/common/TestAbstractJobHandle.java
+++ b/client-common/src/test/java/com/cloudera/livy/client/common/TestAbstractJobHandle.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/test/java/com/cloudera/livy/client/common/TestBufferUtils.java
----------------------------------------------------------------------
diff --git a/client-common/src/test/java/com/cloudera/livy/client/common/TestBufferUtils.java b/client-common/src/test/java/com/cloudera/livy/client/common/TestBufferUtils.java
index 43346a7..725d506 100644
--- a/client-common/src/test/java/com/cloudera/livy/client/common/TestBufferUtils.java
+++ b/client-common/src/test/java/com/cloudera/livy/client/common/TestBufferUtils.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/test/java/com/cloudera/livy/client/common/TestClientConf.java
----------------------------------------------------------------------
diff --git a/client-common/src/test/java/com/cloudera/livy/client/common/TestClientConf.java b/client-common/src/test/java/com/cloudera/livy/client/common/TestClientConf.java
index afb7798..f00c996 100644
--- a/client-common/src/test/java/com/cloudera/livy/client/common/TestClientConf.java
+++ b/client-common/src/test/java/com/cloudera/livy/client/common/TestClientConf.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/test/java/com/cloudera/livy/client/common/TestHttpMessages.java
----------------------------------------------------------------------
diff --git a/client-common/src/test/java/com/cloudera/livy/client/common/TestHttpMessages.java b/client-common/src/test/java/com/cloudera/livy/client/common/TestHttpMessages.java
index 444165b..c6adeca 100644
--- a/client-common/src/test/java/com/cloudera/livy/client/common/TestHttpMessages.java
+++ b/client-common/src/test/java/com/cloudera/livy/client/common/TestHttpMessages.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/test/java/com/cloudera/livy/client/common/TestSerializer.java
----------------------------------------------------------------------
diff --git a/client-common/src/test/java/com/cloudera/livy/client/common/TestSerializer.java b/client-common/src/test/java/com/cloudera/livy/client/common/TestSerializer.java
index 87f810b..76fade1 100644
--- a/client-common/src/test/java/com/cloudera/livy/client/common/TestSerializer.java
+++ b/client-common/src/test/java/com/cloudera/livy/client/common/TestSerializer.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-common/src/test/java/com/cloudera/livy/client/common/TestTestUtils.java
----------------------------------------------------------------------
diff --git a/client-common/src/test/java/com/cloudera/livy/client/common/TestTestUtils.java b/client-common/src/test/java/com/cloudera/livy/client/common/TestTestUtils.java
index 941d07e..de1bf93 100644
--- a/client-common/src/test/java/com/cloudera/livy/client/common/TestTestUtils.java
+++ b/client-common/src/test/java/com/cloudera/livy/client/common/TestTestUtils.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-http/pom.xml
----------------------------------------------------------------------
diff --git a/client-http/pom.xml b/client-http/pom.xml
index 478e222..056d4c0 100644
--- a/client-http/pom.xml
+++ b/client-http/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-http/src/main/java/com/cloudera/livy/client/http/HttpClient.java
----------------------------------------------------------------------
diff --git a/client-http/src/main/java/com/cloudera/livy/client/http/HttpClient.java b/client-http/src/main/java/com/cloudera/livy/client/http/HttpClient.java
index 466b433..943fdb5 100644
--- a/client-http/src/main/java/com/cloudera/livy/client/http/HttpClient.java
+++ b/client-http/src/main/java/com/cloudera/livy/client/http/HttpClient.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-http/src/main/java/com/cloudera/livy/client/http/HttpClientFactory.java
----------------------------------------------------------------------
diff --git a/client-http/src/main/java/com/cloudera/livy/client/http/HttpClientFactory.java b/client-http/src/main/java/com/cloudera/livy/client/http/HttpClientFactory.java
index cd36a5c..2062ef2 100644
--- a/client-http/src/main/java/com/cloudera/livy/client/http/HttpClientFactory.java
+++ b/client-http/src/main/java/com/cloudera/livy/client/http/HttpClientFactory.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-http/src/main/java/com/cloudera/livy/client/http/HttpConf.java
----------------------------------------------------------------------
diff --git a/client-http/src/main/java/com/cloudera/livy/client/http/HttpConf.java b/client-http/src/main/java/com/cloudera/livy/client/http/HttpConf.java
index 2ae25e5..4ca3665 100644
--- a/client-http/src/main/java/com/cloudera/livy/client/http/HttpConf.java
+++ b/client-http/src/main/java/com/cloudera/livy/client/http/HttpConf.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-http/src/main/java/com/cloudera/livy/client/http/JobHandleImpl.java
----------------------------------------------------------------------
diff --git a/client-http/src/main/java/com/cloudera/livy/client/http/JobHandleImpl.java b/client-http/src/main/java/com/cloudera/livy/client/http/JobHandleImpl.java
index 44f8b54..e437059 100644
--- a/client-http/src/main/java/com/cloudera/livy/client/http/JobHandleImpl.java
+++ b/client-http/src/main/java/com/cloudera/livy/client/http/JobHandleImpl.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-http/src/main/java/com/cloudera/livy/client/http/LivyConnection.java
----------------------------------------------------------------------
diff --git a/client-http/src/main/java/com/cloudera/livy/client/http/LivyConnection.java b/client-http/src/main/java/com/cloudera/livy/client/http/LivyConnection.java
index 851d8d6..e48013f 100644
--- a/client-http/src/main/java/com/cloudera/livy/client/http/LivyConnection.java
+++ b/client-http/src/main/java/com/cloudera/livy/client/http/LivyConnection.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-http/src/test/scala/com/cloudera/livy/client/http/HttpClientSpec.scala
----------------------------------------------------------------------
diff --git a/client-http/src/test/scala/com/cloudera/livy/client/http/HttpClientSpec.scala b/client-http/src/test/scala/com/cloudera/livy/client/http/HttpClientSpec.scala
index be2cfa9..f3ebcd5 100644
--- a/client-http/src/test/scala/com/cloudera/livy/client/http/HttpClientSpec.scala
+++ b/client-http/src/test/scala/com/cloudera/livy/client/http/HttpClientSpec.scala
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/client-http/src/test/scala/com/cloudera/livy/client/http/LivyConnectionSpec.scala
----------------------------------------------------------------------
diff --git a/client-http/src/test/scala/com/cloudera/livy/client/http/LivyConnectionSpec.scala b/client-http/src/test/scala/com/cloudera/livy/client/http/LivyConnectionSpec.scala
index 4e36106..e1d29ca 100644
--- a/client-http/src/test/scala/com/cloudera/livy/client/http/LivyConnectionSpec.scala
+++ b/client-http/src/test/scala/com/cloudera/livy/client/http/LivyConnectionSpec.scala
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/conf/livy-env.sh.template
----------------------------------------------------------------------
diff --git a/conf/livy-env.sh.template b/conf/livy-env.sh.template
index b348935..7cba5c3 100644
--- a/conf/livy-env.sh.template
+++ b/conf/livy-env.sh.template
@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
 #
-# Licensed to Cloudera, Inc. under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  Cloudera, Inc. 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
+# 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
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/conf/log4j.properties.template
----------------------------------------------------------------------
diff --git a/conf/log4j.properties.template b/conf/log4j.properties.template
index f855899..18e271c 100644
--- a/conf/log4j.properties.template
+++ b/conf/log4j.properties.template
@@ -1,13 +1,11 @@
+# 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
 #
-# Licensed to Cloudera, Inc. under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  Cloudera, Inc. 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
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 437f00f..e08e55b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/core/scala-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/core/scala-2.10/pom.xml b/core/scala-2.10/pom.xml
index 6ac60d6..b8e7bc5 100644
--- a/core/scala-2.10/pom.xml
+++ b/core/scala-2.10/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/core/scala-2.11/pom.xml
----------------------------------------------------------------------
diff --git a/core/scala-2.11/pom.xml b/core/scala-2.11/pom.xml
index e9e57df..1f817ab 100644
--- a/core/scala-2.11/pom.xml
+++ b/core/scala-2.11/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/core/src/main/scala/com/cloudera/livy/Logging.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/com/cloudera/livy/Logging.scala b/core/src/main/scala/com/cloudera/livy/Logging.scala
index 142564e..8532ea2 100644
--- a/core/src/main/scala/com/cloudera/livy/Logging.scala
+++ b/core/src/main/scala/com/cloudera/livy/Logging.scala
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/core/src/main/scala/com/cloudera/livy/Utils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/com/cloudera/livy/Utils.scala b/core/src/main/scala/com/cloudera/livy/Utils.scala
index 308f4d2..0d779dd 100644
--- a/core/src/main/scala/com/cloudera/livy/Utils.scala
+++ b/core/src/main/scala/com/cloudera/livy/Utils.scala
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/core/src/main/scala/com/cloudera/livy/msgs.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/com/cloudera/livy/msgs.scala b/core/src/main/scala/com/cloudera/livy/msgs.scala
index 2650200..39ee152 100644
--- a/core/src/main/scala/com/cloudera/livy/msgs.scala
+++ b/core/src/main/scala/com/cloudera/livy/msgs.scala
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/core/src/main/scala/com/cloudera/livy/sessions/Kind.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/com/cloudera/livy/sessions/Kind.scala b/core/src/main/scala/com/cloudera/livy/sessions/Kind.scala
index 5663114..7a6480b 100644
--- a/core/src/main/scala/com/cloudera/livy/sessions/Kind.scala
+++ b/core/src/main/scala/com/cloudera/livy/sessions/Kind.scala
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/core/src/main/scala/com/cloudera/livy/sessions/SessionState.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/com/cloudera/livy/sessions/SessionState.scala b/core/src/main/scala/com/cloudera/livy/sessions/SessionState.scala
index ac4bf9b..831b01a 100644
--- a/core/src/main/scala/com/cloudera/livy/sessions/SessionState.scala
+++ b/core/src/main/scala/com/cloudera/livy/sessions/SessionState.scala
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/core/src/test/scala/com/cloudera/livy/LivyBaseUnitTestSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/com/cloudera/livy/LivyBaseUnitTestSuite.scala b/core/src/test/scala/com/cloudera/livy/LivyBaseUnitTestSuite.scala
index dd1ac57..d833e39 100644
--- a/core/src/test/scala/com/cloudera/livy/LivyBaseUnitTestSuite.scala
+++ b/core/src/test/scala/com/cloudera/livy/LivyBaseUnitTestSuite.scala
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/coverage/pom.xml
----------------------------------------------------------------------
diff --git a/coverage/pom.xml b/coverage/pom.xml
index d834288..2cf945a 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/dev/livy-shell
----------------------------------------------------------------------
diff --git a/dev/livy-shell b/dev/livy-shell
index bea40ed..0e00cf8 100755
--- a/dev/livy-shell
+++ b/dev/livy-shell
@@ -1,5 +1,20 @@
 #!/usr/bin/env python
 #
+# 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.
+#
 # Very bare bones shell for driving a Livy session. Usage:
 #
 #   livy-shell url [option=value ...]

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/dev/spark/bin/spark-submit
----------------------------------------------------------------------
diff --git a/dev/spark/bin/spark-submit b/dev/spark/bin/spark-submit
index fada9b5..7d78f03 100755
--- a/dev/spark/bin/spark-submit
+++ b/dev/spark/bin/spark-submit
@@ -1,5 +1,20 @@
 #!/bin/bash
 #
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 # This is a fake version of "spark-submit" to be used during Livy tests that run Spark as
 # a child process. It does some basic parsing of Spark options to figure out the classpath
 # to be used, and then just runs the SparkSubmit class directly.

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/dev/travis-upload-logs.sh
----------------------------------------------------------------------
diff --git a/dev/travis-upload-logs.sh b/dev/travis-upload-logs.sh
index 657c54c..97333d1 100755
--- a/dev/travis-upload-logs.sh
+++ b/dev/travis-upload-logs.sh
@@ -1,4 +1,20 @@
 #!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 set -e
 

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 66a1c61..d1deec1 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/examples/src/main/java/com/cloudera/livy/examples/PiApp.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/com/cloudera/livy/examples/PiApp.java b/examples/src/main/java/com/cloudera/livy/examples/PiApp.java
index f40a911..7971474 100644
--- a/examples/src/main/java/com/cloudera/livy/examples/PiApp.java
+++ b/examples/src/main/java/com/cloudera/livy/examples/PiApp.java
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/examples/src/main/python/pi_app.py
----------------------------------------------------------------------
diff --git a/examples/src/main/python/pi_app.py b/examples/src/main/python/pi_app.py
index 7586906..2945d4b 100644
--- a/examples/src/main/python/pi_app.py
+++ b/examples/src/main/python/pi_app.py
@@ -1,13 +1,12 @@
 #
-# Licensed to Cloudera, Inc. under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  Cloudera, Inc. 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
+# 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
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/examples/src/main/scala/com/cloudera/livy/examples/WordCountApp.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/com/cloudera/livy/examples/WordCountApp.scala b/examples/src/main/scala/com/cloudera/livy/examples/WordCountApp.scala
index 241d7b7..55b9da2 100644
--- a/examples/src/main/scala/com/cloudera/livy/examples/WordCountApp.scala
+++ b/examples/src/main/scala/com/cloudera/livy/examples/WordCountApp.scala
@@ -1,13 +1,12 @@
 /*
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. 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
+ * 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
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/integration-test/minicluster-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/integration-test/minicluster-dependencies/pom.xml b/integration-test/minicluster-dependencies/pom.xml
index c19ff6c..d6a400c 100644
--- a/integration-test/minicluster-dependencies/pom.xml
+++ b/integration-test/minicluster-dependencies/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/integration-test/minicluster-dependencies/scala-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/integration-test/minicluster-dependencies/scala-2.10/pom.xml b/integration-test/minicluster-dependencies/scala-2.10/pom.xml
index 6118301..b3493e9 100644
--- a/integration-test/minicluster-dependencies/scala-2.10/pom.xml
+++ b/integration-test/minicluster-dependencies/scala-2.10/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/cb5b8aac/integration-test/minicluster-dependencies/scala-2.11/pom.xml
----------------------------------------------------------------------
diff --git a/integration-test/minicluster-dependencies/scala-2.11/pom.xml b/integration-test/minicluster-dependencies/scala-2.11/pom.xml
index 8bdf7f4..d0e3fc7 100644
--- a/integration-test/minicluster-dependencies/scala-2.11/pom.xml
+++ b/integration-test/minicluster-dependencies/scala-2.11/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to Cloudera, Inc. under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  Cloudera, Inc. 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
+  ~ 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
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,