You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by mr...@apache.org on 2018/05/18 19:45:21 UTC

[incubator-openwhisk-wskdeploy] branch master updated: Fix for 909 (#910)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5fa0e94  Fix for 909 (#910)
5fa0e94 is described below

commit 5fa0e94149371f38d6a617bf300dd2e415fb7167
Author: Priti Desai <pd...@us.ibm.com>
AuthorDate: Fri May 18 12:45:17 2018 -0700

    Fix for 909 (#910)
    
    * first round of updating licesnse
    
    * converting full headers to mini header
    
    * adding back full header in .go and .java
---
 tests/apps/openwhisk-githubslackbot/manifest.yaml  | 13 +-----------
 .../runtimes/node/actions/process-change.js        | 22 +++------------------
 .../runtimes/node/manifest.yaml                    | 13 +-----------
 .../runtimes/php/manifest.yaml                     | 13 +-----------
 .../runtimes/python/manifest.yaml                  | 13 +-----------
 .../runtimes/swift/manifest.yaml                   | 13 +-----------
 tests/dat/deployment_compose_trigger.yaml          | 13 +-----------
 ...deployment_data_action_with_inputs_outputs.yaml | 13 +-----------
 tests/dat/deployment_data_packages.yaml            | 13 +-----------
 tests/dat/deployment_data_packages_env_var.yaml    | 13 +-----------
 tests/dat/deployment_data_project.yaml             | 13 +-----------
 tests/dat/deployment_data_project_package.yaml     | 13 +-----------
 .../deployment_data_project_packages_env_var.yaml  | 13 +-----------
 ...ployment_data_project_packages_env_var_con.yaml | 13 +-----------
 ...ment_deploymentreader_packages_bind_trigger.yml | 13 +-----------
 ...yment_deploymentreader_project_bind_trigger.yml | 13 +-----------
 .../deployment_validate_action_annotations.yaml    | 13 +-----------
 tests/dat/deployment_validate_credentials.yaml     | 13 +-----------
 .../dat/deployment_validate_deployment_reader.yaml | 13 +-----------
 tests/dat/manifest_bad_yaml_invalid_comment.yaml   | 13 +-----------
 ...anifest_bad_yaml_invalid_key_mapping_value.yaml | 13 +-----------
 .../dat/manifest_bad_yaml_invalid_package_key.yaml | 13 +-----------
 tests/dat/manifest_bad_yaml_missing_root_key.yaml  | 13 +-----------
 ...ifest_data_compose_actions_for_annotations.yaml | 13 +-----------
 .../manifest_data_compose_actions_for_docker.yaml  | 13 +-----------
 ...manifest_data_compose_actions_for_function.yaml | 13 +-----------
 ...data_compose_actions_for_function_and_code.yaml | 13 +-----------
 ...mpose_actions_for_function_with_remote_dir.yaml | 13 +-----------
 ...ifest_data_compose_actions_for_invalid_web.yaml | 13 +-----------
 .../manifest_data_compose_actions_for_limits.yaml  | 13 +-----------
 ...pose_actions_for_missing_runtime_with_code.yaml | 13 +-----------
 .../dat/manifest_data_compose_actions_for_web.yaml | 13 +-----------
 ...ata_compose_actions_for_web_and_web_export.yaml | 13 +-----------
 tests/dat/manifest_data_compose_api_records.yaml   | 13 +-----------
 tests/dat/manifest_data_compose_dependencies.yaml  | 13 +-----------
 tests/dat/manifest_data_compose_packages.yaml      |  2 ++
 tests/dat/manifest_data_compose_rules.yaml         | 13 +-----------
 .../manifest_data_compose_runtimes_implicit.yaml   | 13 +-----------
 tests/dat/manifest_data_compose_sequences.yaml     | 13 +-----------
 tests/dat/manifest_data_compose_triggers.yaml      | 13 +-----------
 tests/dat/manifest_data_rule_env_var.yaml          | 13 +-----------
 tests/dat/manifest_data_unmarshal_packages.yaml    | 13 +-----------
 tests/dat/manifest_hello_java_jar.yaml             | 13 +-----------
 tests/dat/manifest_hello_nodejs.yaml               | 13 +-----------
 tests/dat/manifest_hello_nodejs_with_params.yaml   | 13 +-----------
 tests/dat/manifest_hello_python.yaml               | 13 +-----------
 tests/dat/manifest_hello_swift.yaml                | 13 +-----------
 .../dat/manifest_invalid_packages_key_missing.yaml | 13 +-----------
 tests/dat/manifest_validate_action_all.yaml        | 13 +-----------
 .../dat/manifest_validate_action_annotations.yaml  | 13 +-----------
 tests/dat/manifest_validate_credentials.yaml       | 13 +-----------
 tests/dat/manifest_validate_dependencies.yaml      | 13 +-----------
 .../dat/manifest_validate_dependencies_bogus.yaml  | 13 +-----------
 tests/dat/manifest_validate_deployment_reader.yaml | 13 +-----------
 tests/dat/manifest_validate_feed.yaml              | 13 +-----------
 tests/dat/manifest_validate_json_params.yaml       | 13 +-----------
 tests/dat/manifest_validate_multiline_params.yaml  | 13 +-----------
 tests/dat/manifest_validate_package_grammar.yaml   | 13 +-----------
 .../manifest_validate_package_grammar_env_var.yaml | 13 +-----------
 ...st_validate_package_inputs_and_annotations.yaml | 13 +-----------
 tests/dat/manifest_validate_params.yaml            | 13 +-----------
 tests/dat/manifest_validate_rule.yaml              | 13 +-----------
 tests/dat/manifest_validate_rules_bogus.yaml       | 13 +-----------
 tests/dat/manifest_validate_sequences_bogus.yaml   | 13 +-----------
 tests/dat/manifest_validate_singleline_params.yaml | 13 +-----------
 ...ifest_validate_trigger_action_rule_grammar.yaml | 13 +-----------
 tests/dat/manifest_validate_triggerfeed.yaml       | 13 +-----------
 tests/dat/manifest_validate_triggers_bogus.yaml    | 13 +-----------
 .../src/integration/alarmtrigger/actions/hello.js  | 22 +++------------------
 tests/src/integration/alarmtrigger/deployment.yaml | 13 +-----------
 tests/src/integration/alarmtrigger/manifest.yaml   | 13 +-----------
 tests/src/integration/apigateway/manifest.yml      | 13 +-----------
 .../src/integration/apigateway/src/delete-books.js | 22 +++------------------
 tests/src/integration/apigateway/src/get-books.js  | 22 +++------------------
 tests/src/integration/apigateway/src/greeting.js   | 22 +++------------------
 .../src/integration/apigateway/src/list-members.js | 22 +++------------------
 tests/src/integration/apigateway/src/post-books.js | 22 +++------------------
 tests/src/integration/apigateway/src/put-books.js  | 22 +++------------------
 .../integration/cloudant/actions/process-change.js | 16 ++-------------
 tests/src/integration/cloudant/manifest.yaml       | 13 +-----------
 .../src/integration/conductor/actions/increment.js | 16 ++-------------
 tests/src/integration/conductor/actions/triple.js  | 16 ++-------------
 .../conductor/actions/tripleAndIncrement.js        | 16 ++-------------
 tests/src/integration/conductor/manifest.yaml      | 14 ++-----------
 .../integration/defaultpackage/actions/hello.js    | 16 ++-------------
 .../defaultpackage/manifest-with-project.yaml      | 13 +-----------
 tests/src/integration/defaultpackage/manifest.yaml | 13 +-----------
 tests/src/integration/dependency/manifest.yaml     | 13 +-----------
 tests/src/integration/docker/manifest.yaml         | 13 +-----------
 tests/src/integration/export/manifest_2pack.yaml   | 13 +-----------
 tests/src/integration/export/manifest_ext.yaml     | 13 +-----------
 tests/src/integration/export/manifest_lib1.yaml    | 13 +-----------
 tests/src/integration/export/manifest_lib2.yaml    | 13 +-----------
 tests/src/integration/export/src/greeting.js       |  6 ++++--
 tests/src/integration/flagstests/deployment.yml    | 13 +-----------
 tests/src/integration/flagstests/manifest.yaml     | 13 +-----------
 tests/src/integration/flagstests/manifest.yml      | 13 +-----------
 tests/src/integration/flagstests/src/greeting.js   | 22 +++------------------
 tests/src/integration/helloworld/actions/hello.js  | 16 ++-------------
 tests/src/integration/helloworld/actions/hello.py  | 16 ++-------------
 .../src/integration/helloworld/actions/hello.swift | 16 ++-------------
 tests/src/integration/helloworld/deployment.yaml   | 13 +-----------
 tests/src/integration/helloworld/manifest.yaml     | 13 +-----------
 tests/src/integration/jaraction/manifest.yaml      | 13 +-----------
 tests/src/integration/jaraction/src/Hello.java     |  1 +
 .../00-manifest-minus-second-package.yaml          | 13 +-----------
 .../01-manifest-minus-sequence-2.yaml              | 13 +-----------
 .../02-manifest-minus-action-3.yaml                | 13 +-----------
 .../03-manifest-minus-trigger.yaml                 | 13 +-----------
 .../04-manifest-minus-package.yaml                 | 13 +-----------
 .../managed-deployment/05-manifest-headless.yaml   | 13 +-----------
 .../06-manifest-with-single-dependency.yaml        | 13 +-----------
 .../07-manifest-with-dependency.yaml               | 13 +-----------
 ...manifest-with-dependencies-on-whisk-system.yaml | 13 +-----------
 .../managed-deployment/actions/hello.js            | 16 ++-------------
 .../integration/managed-deployment/manifest.yaml   | 13 +-----------
 tests/src/integration/message-hub/deployment.yaml  | 13 +-----------
 tests/src/integration/message-hub/manifest.yaml    | 13 +-----------
 .../message-hub/src/process-messages.js            | 23 +++-------------------
 .../message-hub/src/receive-messages.js            | 22 +++------------------
 tests/src/integration/runtimetests/manifest.yaml   | 13 +-----------
 tests/src/integration/runtimetests/src/greeting.js | 22 +++------------------
 tests/src/integration/runtimetests/src/hello.php   | 22 +++------------------
 tests/src/integration/runtimetests/src/hello.py    | 21 +++-----------------
 tests/src/integration/runtimetests/src/hello.swift | 22 +++------------------
 .../runtimetests/src/helloworld/index.js           | 22 +++------------------
 tests/src/integration/triggerrule/deployment.yml   | 13 +-----------
 tests/src/integration/triggerrule/manifest.yml     | 13 +-----------
 tests/src/integration/triggerrule/src/greeting.js  | 22 +++------------------
 .../validate-action-annotations/actions/hello.js   | 16 ++-------------
 .../validate-action-annotations/deployment.yaml    | 13 +-----------
 .../validate-action-annotations/manifest.yaml      | 13 +-----------
 .../actions/helloworld.js                          | 22 +++------------------
 .../deployment.yaml                                | 13 +-----------
 .../manifest.yaml                                  | 13 +-----------
 .../actions/hello.js                               | 19 +++---------------
 .../deployment.yaml                                | 13 +-----------
 .../deployment.yml                                 | 13 +-----------
 .../manifest.yaml                                  | 13 +-----------
 .../manifest.yml                                   | 13 +-----------
 .../not-standard-deployment.yaml                   | 13 +-----------
 .../not-standard-manifest.yaml                     | 13 +-----------
 .../random-name-1.yaml                             |  2 ++
 .../random-name-2.yaml                             |  2 ++
 .../yaml-deployment-with-yml-manifest.yaml         |  2 ++
 .../yaml-manifest-with-yml-deployment.yaml         |  2 ++
 .../yml-deployment-with-yaml-manifest.yml          | 13 +-----------
 .../yml-manifest-with-yaml-deployment.yml          | 13 +-----------
 .../validate-packages-in-manifest/actions/hello.js | 16 ++-------------
 .../validate-packages-in-manifest/actions/hello.py | 16 ++-------------
 .../validate-packages-in-manifest/deployment.yaml  |  2 ++
 .../validate-packages-in-manifest/manifest.yaml    |  2 ++
 .../integration/validate-project/actions/hello.js  | 16 ++-------------
 .../integration/validate-project/deployment.yaml   |  2 ++
 .../src/integration/validate-project/manifest.yaml |  2 ++
 .../actions/helloworld.js                          |  6 ++++--
 .../validatePackagesInDeployment/deployment.yaml   |  2 ++
 .../validatePackagesInDeployment/manifest.yaml     |  2 ++
 .../validateSequencesCreation/actions/function.js  |  6 ++++--
 tests/src/integration/webaction/manifest.yml       | 13 +-----------
 tests/src/integration/webaction/src/greeting.js    |  6 ++++--
 tests/src/integration/websequence/manifest.yaml    |  2 ++
 tests/src/integration/websequence/src/greeting.js  |  6 ++++--
 .../src/integration/zipaction/actions/cat/index.js |  6 ++++--
 .../zipaction/actions/cat/node_modules/cat/bin.js  |  6 ++++--
 .../actions/cat/node_modules/cat/example.js        |  6 ++++--
 .../actions/cat/node_modules/cat/index.js          |  6 ++++--
 tests/src/integration/zipaction/deployment.yml     | 13 +-----------
 tests/src/integration/zipaction/manifest.yml       | 13 +-----------
 169 files changed, 260 insertions(+), 1938 deletions(-)

diff --git a/tests/apps/openwhisk-githubslackbot/manifest.yaml b/tests/apps/openwhisk-githubslackbot/manifest.yaml
index f91b1cd..a4c76c7 100644
--- a/tests/apps/openwhisk-githubslackbot/manifest.yaml
+++ b/tests/apps/openwhisk-githubslackbot/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 ##############################
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/node/actions/process-change.js b/tests/apps/owbp-cloudant-trigger/runtimes/node/actions/process-change.js
index 1b1d80a..7d3a7c3 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/node/actions/process-change.js
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/node/actions/process-change.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 function main(params) {
 
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml b/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml
index 2ca5f5e..932d94e 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 ##############################
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml b/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml
index e245deb..7a62580 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 ##############################
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml b/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml
index e095075..3005781 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 ##############################
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml b/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml
index 3d48b81..e0e4c16 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 ##############################
diff --git a/tests/dat/deployment_compose_trigger.yaml b/tests/dat/deployment_compose_trigger.yaml
index 3e0c73b..ebfac08 100644
--- a/tests/dat/deployment_compose_trigger.yaml
+++ b/tests/dat/deployment_compose_trigger.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/dat/deployment_data_action_with_inputs_outputs.yaml b/tests/dat/deployment_data_action_with_inputs_outputs.yaml
index e6eb447..16c8000 100644
--- a/tests/dat/deployment_data_action_with_inputs_outputs.yaml
+++ b/tests/dat/deployment_data_action_with_inputs_outputs.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 ---
diff --git a/tests/dat/deployment_data_packages.yaml b/tests/dat/deployment_data_packages.yaml
index c8e1233..aab07d8 100644
--- a/tests/dat/deployment_data_packages.yaml
+++ b/tests/dat/deployment_data_packages.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/deployment_data_packages_env_var.yaml b/tests/dat/deployment_data_packages_env_var.yaml
index 0b849d6..d3caa6a 100644
--- a/tests/dat/deployment_data_packages_env_var.yaml
+++ b/tests/dat/deployment_data_packages_env_var.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/deployment_data_project.yaml b/tests/dat/deployment_data_project.yaml
index 0c37906..9b547c3 100644
--- a/tests/dat/deployment_data_project.yaml
+++ b/tests/dat/deployment_data_project.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/dat/deployment_data_project_package.yaml b/tests/dat/deployment_data_project_package.yaml
index 7814daf..52152a0 100644
--- a/tests/dat/deployment_data_project_package.yaml
+++ b/tests/dat/deployment_data_project_package.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/dat/deployment_data_project_packages_env_var.yaml b/tests/dat/deployment_data_project_packages_env_var.yaml
index 6080f97..ac33bca 100644
--- a/tests/dat/deployment_data_project_packages_env_var.yaml
+++ b/tests/dat/deployment_data_project_packages_env_var.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/dat/deployment_data_project_packages_env_var_con.yaml b/tests/dat/deployment_data_project_packages_env_var_con.yaml
index bcef972..1dcca9c 100644
--- a/tests/dat/deployment_data_project_packages_env_var_con.yaml
+++ b/tests/dat/deployment_data_project_packages_env_var_con.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/dat/deployment_deploymentreader_packages_bind_trigger.yml b/tests/dat/deployment_deploymentreader_packages_bind_trigger.yml
index 31749b0..34e8919 100644
--- a/tests/dat/deployment_deploymentreader_packages_bind_trigger.yml
+++ b/tests/dat/deployment_deploymentreader_packages_bind_trigger.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/deployment_deploymentreader_project_bind_trigger.yml b/tests/dat/deployment_deploymentreader_project_bind_trigger.yml
index 54d6fdf..c88f391 100644
--- a/tests/dat/deployment_deploymentreader_project_bind_trigger.yml
+++ b/tests/dat/deployment_deploymentreader_project_bind_trigger.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/dat/deployment_validate_action_annotations.yaml b/tests/dat/deployment_validate_action_annotations.yaml
index 9d50ab2..ea01689 100644
--- a/tests/dat/deployment_validate_action_annotations.yaml
+++ b/tests/dat/deployment_validate_action_annotations.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/dat/deployment_validate_credentials.yaml b/tests/dat/deployment_validate_credentials.yaml
index b1eb424..2f8db92 100644
--- a/tests/dat/deployment_validate_credentials.yaml
+++ b/tests/dat/deployment_validate_credentials.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 # do not change or delete this file without changing deployers/whiskclient_test.go
diff --git a/tests/dat/deployment_validate_deployment_reader.yaml b/tests/dat/deployment_validate_deployment_reader.yaml
index 0f1b024..3ef2dc2 100644
--- a/tests/dat/deployment_validate_deployment_reader.yaml
+++ b/tests/dat/deployment_validate_deployment_reader.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/dat/manifest_bad_yaml_invalid_comment.yaml b/tests/dat/manifest_bad_yaml_invalid_comment.yaml
index 295e7b9..dee77f9 100644
--- a/tests/dat/manifest_bad_yaml_invalid_comment.yaml
+++ b/tests/dat/manifest_bad_yaml_invalid_comment.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_bad_yaml_invalid_key_mapping_value.yaml b/tests/dat/manifest_bad_yaml_invalid_key_mapping_value.yaml
index 936baea..955c1bd 100644
--- a/tests/dat/manifest_bad_yaml_invalid_key_mapping_value.yaml
+++ b/tests/dat/manifest_bad_yaml_invalid_key_mapping_value.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_bad_yaml_invalid_package_key.yaml b/tests/dat/manifest_bad_yaml_invalid_package_key.yaml
index 9c6812e..4326359 100644
--- a/tests/dat/manifest_bad_yaml_invalid_package_key.yaml
+++ b/tests/dat/manifest_bad_yaml_invalid_package_key.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_bad_yaml_missing_root_key.yaml b/tests/dat/manifest_bad_yaml_missing_root_key.yaml
index 5736f10..b43d545 100644
--- a/tests/dat/manifest_bad_yaml_missing_root_key.yaml
+++ b/tests/dat/manifest_bad_yaml_missing_root_key.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 actions:
diff --git a/tests/dat/manifest_data_compose_actions_for_annotations.yaml b/tests/dat/manifest_data_compose_actions_for_annotations.yaml
index 588cab1..826e9f1 100644
--- a/tests/dat/manifest_data_compose_actions_for_annotations.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_annotations.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_actions_for_docker.yaml b/tests/dat/manifest_data_compose_actions_for_docker.yaml
index 7fb9819..65bf492 100644
--- a/tests/dat/manifest_data_compose_actions_for_docker.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_docker.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_actions_for_function.yaml b/tests/dat/manifest_data_compose_actions_for_function.yaml
index 2f42fd5..e3078fc 100644
--- a/tests/dat/manifest_data_compose_actions_for_function.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_function.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_actions_for_function_and_code.yaml b/tests/dat/manifest_data_compose_actions_for_function_and_code.yaml
index 8c9316c..990c14a 100644
--- a/tests/dat/manifest_data_compose_actions_for_function_and_code.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_function_and_code.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_actions_for_function_with_remote_dir.yaml b/tests/dat/manifest_data_compose_actions_for_function_with_remote_dir.yaml
index f601c27..d4f995f 100644
--- a/tests/dat/manifest_data_compose_actions_for_function_with_remote_dir.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_function_with_remote_dir.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_actions_for_invalid_web.yaml b/tests/dat/manifest_data_compose_actions_for_invalid_web.yaml
index d45ba58..43aa1d8 100644
--- a/tests/dat/manifest_data_compose_actions_for_invalid_web.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_invalid_web.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_actions_for_limits.yaml b/tests/dat/manifest_data_compose_actions_for_limits.yaml
index 2a4f84a..9a690b9 100644
--- a/tests/dat/manifest_data_compose_actions_for_limits.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_limits.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_actions_for_missing_runtime_with_code.yaml b/tests/dat/manifest_data_compose_actions_for_missing_runtime_with_code.yaml
index 9ab9012..b510a09 100644
--- a/tests/dat/manifest_data_compose_actions_for_missing_runtime_with_code.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_missing_runtime_with_code.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_actions_for_web.yaml b/tests/dat/manifest_data_compose_actions_for_web.yaml
index 729c619..b1121b4 100644
--- a/tests/dat/manifest_data_compose_actions_for_web.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_web.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_actions_for_web_and_web_export.yaml b/tests/dat/manifest_data_compose_actions_for_web_and_web_export.yaml
index c6eb509..42e121a 100644
--- a/tests/dat/manifest_data_compose_actions_for_web_and_web_export.yaml
+++ b/tests/dat/manifest_data_compose_actions_for_web_and_web_export.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_api_records.yaml b/tests/dat/manifest_data_compose_api_records.yaml
index 6191a1f..599cef0 100644
--- a/tests/dat/manifest_data_compose_api_records.yaml
+++ b/tests/dat/manifest_data_compose_api_records.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_dependencies.yaml b/tests/dat/manifest_data_compose_dependencies.yaml
index 2b43349..38be525 100644
--- a/tests/dat/manifest_data_compose_dependencies.yaml
+++ b/tests/dat/manifest_data_compose_dependencies.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_packages.yaml b/tests/dat/manifest_data_compose_packages.yaml
index 1ec2a94..0814a31 100644
--- a/tests/dat/manifest_data_compose_packages.yaml
+++ b/tests/dat/manifest_data_compose_packages.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 packages:
   helloworld:
diff --git a/tests/dat/manifest_data_compose_rules.yaml b/tests/dat/manifest_data_compose_rules.yaml
index d83d09c..4fde937 100644
--- a/tests/dat/manifest_data_compose_rules.yaml
+++ b/tests/dat/manifest_data_compose_rules.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_runtimes_implicit.yaml b/tests/dat/manifest_data_compose_runtimes_implicit.yaml
index 192d722..6724cb8 100644
--- a/tests/dat/manifest_data_compose_runtimes_implicit.yaml
+++ b/tests/dat/manifest_data_compose_runtimes_implicit.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_sequences.yaml b/tests/dat/manifest_data_compose_sequences.yaml
index f68f90b..e5886f8 100644
--- a/tests/dat/manifest_data_compose_sequences.yaml
+++ b/tests/dat/manifest_data_compose_sequences.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_data_compose_triggers.yaml b/tests/dat/manifest_data_compose_triggers.yaml
index 44d5653..b892ad8 100644
--- a/tests/dat/manifest_data_compose_triggers.yaml
+++ b/tests/dat/manifest_data_compose_triggers.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/dat/manifest_data_rule_env_var.yaml b/tests/dat/manifest_data_rule_env_var.yaml
index b92f592..1062012 100644
--- a/tests/dat/manifest_data_rule_env_var.yaml
+++ b/tests/dat/manifest_data_rule_env_var.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 # This test file is used to test the basic Trigger-Action-Rule grammar
diff --git a/tests/dat/manifest_data_unmarshal_packages.yaml b/tests/dat/manifest_data_unmarshal_packages.yaml
index e845ce1..5bea498 100644
--- a/tests/dat/manifest_data_unmarshal_packages.yaml
+++ b/tests/dat/manifest_data_unmarshal_packages.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_hello_java_jar.yaml b/tests/dat/manifest_hello_java_jar.yaml
index ac02595..ecd39d6 100644
--- a/tests/dat/manifest_hello_java_jar.yaml
+++ b/tests/dat/manifest_hello_java_jar.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_hello_nodejs.yaml b/tests/dat/manifest_hello_nodejs.yaml
index 20618f2..32cc5cf 100644
--- a/tests/dat/manifest_hello_nodejs.yaml
+++ b/tests/dat/manifest_hello_nodejs.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_hello_nodejs_with_params.yaml b/tests/dat/manifest_hello_nodejs_with_params.yaml
index 70f31e8..53f30bc 100644
--- a/tests/dat/manifest_hello_nodejs_with_params.yaml
+++ b/tests/dat/manifest_hello_nodejs_with_params.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_hello_python.yaml b/tests/dat/manifest_hello_python.yaml
index 4e96c1e..32c006c 100644
--- a/tests/dat/manifest_hello_python.yaml
+++ b/tests/dat/manifest_hello_python.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_hello_swift.yaml b/tests/dat/manifest_hello_swift.yaml
index ab0e236..3248c84 100644
--- a/tests/dat/manifest_hello_swift.yaml
+++ b/tests/dat/manifest_hello_swift.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_invalid_packages_key_missing.yaml b/tests/dat/manifest_invalid_packages_key_missing.yaml
index 0eaf7ed..f8800e0 100644
--- a/tests/dat/manifest_invalid_packages_key_missing.yaml
+++ b/tests/dat/manifest_invalid_packages_key_missing.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 # packages:
diff --git a/tests/dat/manifest_validate_action_all.yaml b/tests/dat/manifest_validate_action_all.yaml
index 8faf05f..fb43426 100644
--- a/tests/dat/manifest_validate_action_all.yaml
+++ b/tests/dat/manifest_validate_action_all.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_action_annotations.yaml b/tests/dat/manifest_validate_action_annotations.yaml
index 123b2a6..ecc1473 100644
--- a/tests/dat/manifest_validate_action_annotations.yaml
+++ b/tests/dat/manifest_validate_action_annotations.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_credentials.yaml b/tests/dat/manifest_validate_credentials.yaml
index d18e95b..03dec64 100644
--- a/tests/dat/manifest_validate_credentials.yaml
+++ b/tests/dat/manifest_validate_credentials.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_dependencies.yaml b/tests/dat/manifest_validate_dependencies.yaml
index 300cdad..2354135 100644
--- a/tests/dat/manifest_validate_dependencies.yaml
+++ b/tests/dat/manifest_validate_dependencies.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_dependencies_bogus.yaml b/tests/dat/manifest_validate_dependencies_bogus.yaml
index f75c3b1..78c8155 100644
--- a/tests/dat/manifest_validate_dependencies_bogus.yaml
+++ b/tests/dat/manifest_validate_dependencies_bogus.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_deployment_reader.yaml b/tests/dat/manifest_validate_deployment_reader.yaml
index 29be42e..079066f 100644
--- a/tests/dat/manifest_validate_deployment_reader.yaml
+++ b/tests/dat/manifest_validate_deployment_reader.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_feed.yaml b/tests/dat/manifest_validate_feed.yaml
index 6240bcd..13bb49d 100644
--- a/tests/dat/manifest_validate_feed.yaml
+++ b/tests/dat/manifest_validate_feed.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_json_params.yaml b/tests/dat/manifest_validate_json_params.yaml
index 57030d0..6209ee7 100644
--- a/tests/dat/manifest_validate_json_params.yaml
+++ b/tests/dat/manifest_validate_json_params.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_multiline_params.yaml b/tests/dat/manifest_validate_multiline_params.yaml
index 5877dc6..4111d74 100644
--- a/tests/dat/manifest_validate_multiline_params.yaml
+++ b/tests/dat/manifest_validate_multiline_params.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_package_grammar.yaml b/tests/dat/manifest_validate_package_grammar.yaml
index 15ce7b8..db8f6d5 100644
--- a/tests/dat/manifest_validate_package_grammar.yaml
+++ b/tests/dat/manifest_validate_package_grammar.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 # This test file is used to test the basic Package grammar
diff --git a/tests/dat/manifest_validate_package_grammar_env_var.yaml b/tests/dat/manifest_validate_package_grammar_env_var.yaml
index 8e4fac0..1f1d8e5 100644
--- a/tests/dat/manifest_validate_package_grammar_env_var.yaml
+++ b/tests/dat/manifest_validate_package_grammar_env_var.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 # This test file is used to test the basic Package grammar
diff --git a/tests/dat/manifest_validate_package_inputs_and_annotations.yaml b/tests/dat/manifest_validate_package_inputs_and_annotations.yaml
index ea5f253..f8bc192 100644
--- a/tests/dat/manifest_validate_package_inputs_and_annotations.yaml
+++ b/tests/dat/manifest_validate_package_inputs_and_annotations.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_params.yaml b/tests/dat/manifest_validate_params.yaml
index 7ace84e..2674a41 100644
--- a/tests/dat/manifest_validate_params.yaml
+++ b/tests/dat/manifest_validate_params.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_rule.yaml b/tests/dat/manifest_validate_rule.yaml
index e46969d..cb23b86 100644
--- a/tests/dat/manifest_validate_rule.yaml
+++ b/tests/dat/manifest_validate_rule.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_rules_bogus.yaml b/tests/dat/manifest_validate_rules_bogus.yaml
index 587929f..498e53e 100644
--- a/tests/dat/manifest_validate_rules_bogus.yaml
+++ b/tests/dat/manifest_validate_rules_bogus.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_sequences_bogus.yaml b/tests/dat/manifest_validate_sequences_bogus.yaml
index 4d5425d..589e800 100644
--- a/tests/dat/manifest_validate_sequences_bogus.yaml
+++ b/tests/dat/manifest_validate_sequences_bogus.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_singleline_params.yaml b/tests/dat/manifest_validate_singleline_params.yaml
index fb7cca8..e1921db 100644
--- a/tests/dat/manifest_validate_singleline_params.yaml
+++ b/tests/dat/manifest_validate_singleline_params.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_trigger_action_rule_grammar.yaml b/tests/dat/manifest_validate_trigger_action_rule_grammar.yaml
index 0bed2ab..98bf3b8 100644
--- a/tests/dat/manifest_validate_trigger_action_rule_grammar.yaml
+++ b/tests/dat/manifest_validate_trigger_action_rule_grammar.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 # This test file is used to test the basic Trigger-Action-Rule grammar
diff --git a/tests/dat/manifest_validate_triggerfeed.yaml b/tests/dat/manifest_validate_triggerfeed.yaml
index 680a867..9b61048 100644
--- a/tests/dat/manifest_validate_triggerfeed.yaml
+++ b/tests/dat/manifest_validate_triggerfeed.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/dat/manifest_validate_triggers_bogus.yaml b/tests/dat/manifest_validate_triggers_bogus.yaml
index 2b3b2c2..70542ac 100644
--- a/tests/dat/manifest_validate_triggers_bogus.yaml
+++ b/tests/dat/manifest_validate_triggers_bogus.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/alarmtrigger/actions/hello.js b/tests/src/integration/alarmtrigger/actions/hello.js
index fa7ee81..80a9062 100644
--- a/tests/src/integration/alarmtrigger/actions/hello.js
+++ b/tests/src/integration/alarmtrigger/actions/hello.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 function main(params) {
   return {payload:  'Hello, ' + params.name + ' from ' + params.place};
diff --git a/tests/src/integration/alarmtrigger/deployment.yaml b/tests/src/integration/alarmtrigger/deployment.yaml
index 9fa9623..fefbd50 100644
--- a/tests/src/integration/alarmtrigger/deployment.yaml
+++ b/tests/src/integration/alarmtrigger/deployment.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/alarmtrigger/manifest.yaml b/tests/src/integration/alarmtrigger/manifest.yaml
index de99908..633041b 100644
--- a/tests/src/integration/alarmtrigger/manifest.yaml
+++ b/tests/src/integration/alarmtrigger/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/apigateway/manifest.yml b/tests/src/integration/apigateway/manifest.yml
index 5c22af2..9e93317 100644
--- a/tests/src/integration/apigateway/manifest.yml
+++ b/tests/src/integration/apigateway/manifest.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/apigateway/src/delete-books.js b/tests/src/integration/apigateway/src/delete-books.js
index 32d6557..ed051cd 100644
--- a/tests/src/integration/apigateway/src/delete-books.js
+++ b/tests/src/integration/apigateway/src/delete-books.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return success saying a book was deleted from the book store.
diff --git a/tests/src/integration/apigateway/src/get-books.js b/tests/src/integration/apigateway/src/get-books.js
index 6189d89..59d256f 100644
--- a/tests/src/integration/apigateway/src/get-books.js
+++ b/tests/src/integration/apigateway/src/get-books.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a list of books in the book store.
diff --git a/tests/src/integration/apigateway/src/greeting.js b/tests/src/integration/apigateway/src/greeting.js
index f0eb0b5..f5f7a74 100644
--- a/tests/src/integration/apigateway/src/greeting.js
+++ b/tests/src/integration/apigateway/src/greeting.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a simple greeting message for someone.
diff --git a/tests/src/integration/apigateway/src/list-members.js b/tests/src/integration/apigateway/src/list-members.js
index 2946d95..df77d2c 100644
--- a/tests/src/integration/apigateway/src/list-members.js
+++ b/tests/src/integration/apigateway/src/list-members.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a list of members in the book store.
diff --git a/tests/src/integration/apigateway/src/post-books.js b/tests/src/integration/apigateway/src/post-books.js
index 8b5c49b..a798c7d 100644
--- a/tests/src/integration/apigateway/src/post-books.js
+++ b/tests/src/integration/apigateway/src/post-books.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return success saying a book was added into the book store.
diff --git a/tests/src/integration/apigateway/src/put-books.js b/tests/src/integration/apigateway/src/put-books.js
index 7b4f712..b003def 100644
--- a/tests/src/integration/apigateway/src/put-books.js
+++ b/tests/src/integration/apigateway/src/put-books.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return success saying a book was updated into the book store.
diff --git a/tests/src/integration/cloudant/actions/process-change.js b/tests/src/integration/cloudant/actions/process-change.js
index 30a88d4..0d2a610 100644
--- a/tests/src/integration/cloudant/actions/process-change.js
+++ b/tests/src/integration/cloudant/actions/process-change.js
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 /**
diff --git a/tests/src/integration/cloudant/manifest.yaml b/tests/src/integration/cloudant/manifest.yaml
index e4e8cb6..f8ab5b5 100644
--- a/tests/src/integration/cloudant/manifest.yaml
+++ b/tests/src/integration/cloudant/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 ###################
diff --git a/tests/src/integration/conductor/actions/increment.js b/tests/src/integration/conductor/actions/increment.js
index ef3877d..3a6c1a9 100644
--- a/tests/src/integration/conductor/actions/increment.js
+++ b/tests/src/integration/conductor/actions/increment.js
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 /*
diff --git a/tests/src/integration/conductor/actions/triple.js b/tests/src/integration/conductor/actions/triple.js
index 0636d1c..611a202 100644
--- a/tests/src/integration/conductor/actions/triple.js
+++ b/tests/src/integration/conductor/actions/triple.js
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 /*
diff --git a/tests/src/integration/conductor/actions/tripleAndIncrement.js b/tests/src/integration/conductor/actions/tripleAndIncrement.js
index db5bcdb..865f848 100644
--- a/tests/src/integration/conductor/actions/tripleAndIncrement.js
+++ b/tests/src/integration/conductor/actions/tripleAndIncrement.js
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 function main(params) {
diff --git a/tests/src/integration/conductor/manifest.yaml b/tests/src/integration/conductor/manifest.yaml
index 7e8ce4f..20b75c5 100644
--- a/tests/src/integration/conductor/manifest.yaml
+++ b/tests/src/integration/conductor/manifest.yaml
@@ -1,18 +1,8 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
+
 project:
     name: DemoConductor
     packages:
diff --git a/tests/src/integration/defaultpackage/actions/hello.js b/tests/src/integration/defaultpackage/actions/hello.js
index b1357b3..b4efbea 100644
--- a/tests/src/integration/defaultpackage/actions/hello.js
+++ b/tests/src/integration/defaultpackage/actions/hello.js
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 /*
diff --git a/tests/src/integration/defaultpackage/manifest-with-project.yaml b/tests/src/integration/defaultpackage/manifest-with-project.yaml
index 536a1c8..f58400c 100644
--- a/tests/src/integration/defaultpackage/manifest-with-project.yaml
+++ b/tests/src/integration/defaultpackage/manifest-with-project.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/defaultpackage/manifest.yaml b/tests/src/integration/defaultpackage/manifest.yaml
index 6b57459..6890fab 100644
--- a/tests/src/integration/defaultpackage/manifest.yaml
+++ b/tests/src/integration/defaultpackage/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/dependency/manifest.yaml b/tests/src/integration/dependency/manifest.yaml
index df768fd..4193c17 100644
--- a/tests/src/integration/dependency/manifest.yaml
+++ b/tests/src/integration/dependency/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/docker/manifest.yaml b/tests/src/integration/docker/manifest.yaml
index 70606e5..d860504 100644
--- a/tests/src/integration/docker/manifest.yaml
+++ b/tests/src/integration/docker/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/export/manifest_2pack.yaml b/tests/src/integration/export/manifest_2pack.yaml
index 4432938..cce928f 100644
--- a/tests/src/integration/export/manifest_2pack.yaml
+++ b/tests/src/integration/export/manifest_2pack.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/export/manifest_ext.yaml b/tests/src/integration/export/manifest_ext.yaml
index b0dcfb8..0f20c05 100644
--- a/tests/src/integration/export/manifest_ext.yaml
+++ b/tests/src/integration/export/manifest_ext.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/export/manifest_lib1.yaml b/tests/src/integration/export/manifest_lib1.yaml
index 446d90b..be21e9b 100644
--- a/tests/src/integration/export/manifest_lib1.yaml
+++ b/tests/src/integration/export/manifest_lib1.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/export/manifest_lib2.yaml b/tests/src/integration/export/manifest_lib2.yaml
index e9dab41..ffd5fad 100644
--- a/tests/src/integration/export/manifest_lib2.yaml
+++ b/tests/src/integration/export/manifest_lib2.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/export/src/greeting.js b/tests/src/integration/export/src/greeting.js
index 2e5a044..e6842c7 100644
--- a/tests/src/integration/export/src/greeting.js
+++ b/tests/src/integration/export/src/greeting.js
@@ -1,5 +1,7 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor
-// license agreements; and to You under the Apache License, Version 2.0.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a simple greeting message for someone.
diff --git a/tests/src/integration/flagstests/deployment.yml b/tests/src/integration/flagstests/deployment.yml
index 4076633..2bad8a6 100644
--- a/tests/src/integration/flagstests/deployment.yml
+++ b/tests/src/integration/flagstests/deployment.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/flagstests/manifest.yaml b/tests/src/integration/flagstests/manifest.yaml
index fc20d66..18112a0 100644
--- a/tests/src/integration/flagstests/manifest.yaml
+++ b/tests/src/integration/flagstests/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/flagstests/manifest.yml b/tests/src/integration/flagstests/manifest.yml
index cd5f129..b1dddfb 100644
--- a/tests/src/integration/flagstests/manifest.yml
+++ b/tests/src/integration/flagstests/manifest.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/flagstests/src/greeting.js b/tests/src/integration/flagstests/src/greeting.js
index 5c01d98..e6842c7 100644
--- a/tests/src/integration/flagstests/src/greeting.js
+++ b/tests/src/integration/flagstests/src/greeting.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a simple greeting message for someone.
diff --git a/tests/src/integration/helloworld/actions/hello.js b/tests/src/integration/helloworld/actions/hello.js
index 25fdafb..30a7392 100644
--- a/tests/src/integration/helloworld/actions/hello.js
+++ b/tests/src/integration/helloworld/actions/hello.js
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 /*
diff --git a/tests/src/integration/helloworld/actions/hello.py b/tests/src/integration/helloworld/actions/hello.py
index 44c3bd1..1b41955 100644
--- a/tests/src/integration/helloworld/actions/hello.py
+++ b/tests/src/integration/helloworld/actions/hello.py
@@ -1,18 +1,6 @@
 #
-# 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.
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 def main(args):
diff --git a/tests/src/integration/helloworld/actions/hello.swift b/tests/src/integration/helloworld/actions/hello.swift
index 6e591f3..d0e5a78 100644
--- a/tests/src/integration/helloworld/actions/hello.swift
+++ b/tests/src/integration/helloworld/actions/hello.swift
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 func main(args: [String:Any]) -> [String:Any] {
diff --git a/tests/src/integration/helloworld/deployment.yaml b/tests/src/integration/helloworld/deployment.yaml
index 374dde0..4543f06 100644
--- a/tests/src/integration/helloworld/deployment.yaml
+++ b/tests/src/integration/helloworld/deployment.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/helloworld/manifest.yaml b/tests/src/integration/helloworld/manifest.yaml
index b173abd..d43e1f1 100644
--- a/tests/src/integration/helloworld/manifest.yaml
+++ b/tests/src/integration/helloworld/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/jaraction/manifest.yaml b/tests/src/integration/jaraction/manifest.yaml
index 8581d43..2cf651e 100644
--- a/tests/src/integration/jaraction/manifest.yaml
+++ b/tests/src/integration/jaraction/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/jaraction/src/Hello.java b/tests/src/integration/jaraction/src/Hello.java
index 33b2396..fb3a10e 100644
--- a/tests/src/integration/jaraction/src/Hello.java
+++ b/tests/src/integration/jaraction/src/Hello.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 import com.google.gson.JsonObject;
 public class Hello {
     public static JsonObject main(JsonObject args) {
diff --git a/tests/src/integration/managed-deployment/00-manifest-minus-second-package.yaml b/tests/src/integration/managed-deployment/00-manifest-minus-second-package.yaml
index c9ba2bd..8bd694f 100644
--- a/tests/src/integration/managed-deployment/00-manifest-minus-second-package.yaml
+++ b/tests/src/integration/managed-deployment/00-manifest-minus-second-package.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/managed-deployment/01-manifest-minus-sequence-2.yaml b/tests/src/integration/managed-deployment/01-manifest-minus-sequence-2.yaml
index 6aed69c..d1e6a45 100644
--- a/tests/src/integration/managed-deployment/01-manifest-minus-sequence-2.yaml
+++ b/tests/src/integration/managed-deployment/01-manifest-minus-sequence-2.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/managed-deployment/02-manifest-minus-action-3.yaml b/tests/src/integration/managed-deployment/02-manifest-minus-action-3.yaml
index 1fae1a4..561bd48 100644
--- a/tests/src/integration/managed-deployment/02-manifest-minus-action-3.yaml
+++ b/tests/src/integration/managed-deployment/02-manifest-minus-action-3.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/managed-deployment/03-manifest-minus-trigger.yaml b/tests/src/integration/managed-deployment/03-manifest-minus-trigger.yaml
index 88012b4..9c8f2be 100644
--- a/tests/src/integration/managed-deployment/03-manifest-minus-trigger.yaml
+++ b/tests/src/integration/managed-deployment/03-manifest-minus-trigger.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/managed-deployment/04-manifest-minus-package.yaml b/tests/src/integration/managed-deployment/04-manifest-minus-package.yaml
index 0e5ea08..6b9b151 100644
--- a/tests/src/integration/managed-deployment/04-manifest-minus-package.yaml
+++ b/tests/src/integration/managed-deployment/04-manifest-minus-package.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/managed-deployment/05-manifest-headless.yaml b/tests/src/integration/managed-deployment/05-manifest-headless.yaml
index cf2b1c8..dd32ce1 100644
--- a/tests/src/integration/managed-deployment/05-manifest-headless.yaml
+++ b/tests/src/integration/managed-deployment/05-manifest-headless.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/managed-deployment/06-manifest-with-single-dependency.yaml b/tests/src/integration/managed-deployment/06-manifest-with-single-dependency.yaml
index b23bbad..4bed458 100644
--- a/tests/src/integration/managed-deployment/06-manifest-with-single-dependency.yaml
+++ b/tests/src/integration/managed-deployment/06-manifest-with-single-dependency.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/managed-deployment/07-manifest-with-dependency.yaml b/tests/src/integration/managed-deployment/07-manifest-with-dependency.yaml
index f9cb782..190a592 100644
--- a/tests/src/integration/managed-deployment/07-manifest-with-dependency.yaml
+++ b/tests/src/integration/managed-deployment/07-manifest-with-dependency.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/managed-deployment/08-manifest-with-dependencies-on-whisk-system.yaml b/tests/src/integration/managed-deployment/08-manifest-with-dependencies-on-whisk-system.yaml
index 612feeb..d18e8c1 100644
--- a/tests/src/integration/managed-deployment/08-manifest-with-dependencies-on-whisk-system.yaml
+++ b/tests/src/integration/managed-deployment/08-manifest-with-dependencies-on-whisk-system.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/managed-deployment/actions/hello.js b/tests/src/integration/managed-deployment/actions/hello.js
index 25fdafb..30a7392 100644
--- a/tests/src/integration/managed-deployment/actions/hello.js
+++ b/tests/src/integration/managed-deployment/actions/hello.js
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 /*
diff --git a/tests/src/integration/managed-deployment/manifest.yaml b/tests/src/integration/managed-deployment/manifest.yaml
index 50f5a62..e3da4f0 100644
--- a/tests/src/integration/managed-deployment/manifest.yaml
+++ b/tests/src/integration/managed-deployment/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/message-hub/deployment.yaml b/tests/src/integration/message-hub/deployment.yaml
index 90a4ae0..ff8a850 100644
--- a/tests/src/integration/message-hub/deployment.yaml
+++ b/tests/src/integration/message-hub/deployment.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/message-hub/manifest.yaml b/tests/src/integration/message-hub/manifest.yaml
index facc7f1..189c0d9 100644
--- a/tests/src/integration/message-hub/manifest.yaml
+++ b/tests/src/integration/message-hub/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/message-hub/src/process-messages.js b/tests/src/integration/message-hub/src/process-messages.js
index 92b7f43..6cca04b 100644
--- a/tests/src/integration/message-hub/src/process-messages.js
+++ b/tests/src/integration/message-hub/src/process-messages.js
@@ -1,24 +1,7 @@
 /*
- *
- * 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.
- *
-*/
-
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 var openwhisk = require('openwhisk');
 
diff --git a/tests/src/integration/message-hub/src/receive-messages.js b/tests/src/integration/message-hub/src/receive-messages.js
index 10ed0b2..748ef9e 100644
--- a/tests/src/integration/message-hub/src/receive-messages.js
+++ b/tests/src/integration/message-hub/src/receive-messages.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /*
  This function is bound to a trigger and is initiated when the message arrives
diff --git a/tests/src/integration/runtimetests/manifest.yaml b/tests/src/integration/runtimetests/manifest.yaml
index 6dcafad..b812f4f 100644
--- a/tests/src/integration/runtimetests/manifest.yaml
+++ b/tests/src/integration/runtimetests/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/runtimetests/src/greeting.js b/tests/src/integration/runtimetests/src/greeting.js
index f0eb0b5..f5f7a74 100644
--- a/tests/src/integration/runtimetests/src/greeting.js
+++ b/tests/src/integration/runtimetests/src/greeting.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a simple greeting message for someone.
diff --git a/tests/src/integration/runtimetests/src/hello.php b/tests/src/integration/runtimetests/src/hello.php
index 6f2fb98..7724d77 100644
--- a/tests/src/integration/runtimetests/src/hello.php
+++ b/tests/src/integration/runtimetests/src/hello.php
@@ -1,24 +1,8 @@
 <?php
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 function main(array $args) : array
 {
diff --git a/tests/src/integration/runtimetests/src/hello.py b/tests/src/integration/runtimetests/src/hello.py
index f26426f..8b466d7 100644
--- a/tests/src/integration/runtimetests/src/hello.py
+++ b/tests/src/integration/runtimetests/src/hello.py
@@ -1,23 +1,8 @@
 #
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
 #
-# 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.
-#
-#
+
 def main(args):
     name = args.get("name", "stranger")
     greeting = "Hello " + name + "!"
diff --git a/tests/src/integration/runtimetests/src/hello.swift b/tests/src/integration/runtimetests/src/hello.swift
index ca5dd97..0d6c3e5 100644
--- a/tests/src/integration/runtimetests/src/hello.swift
+++ b/tests/src/integration/runtimetests/src/hello.swift
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 func main(args: [String:Any]) -> [String:Any] {
     if let name = args["name"] as? String {
diff --git a/tests/src/integration/runtimetests/src/helloworld/index.js b/tests/src/integration/runtimetests/src/helloworld/index.js
index 605c313..878bfd6 100644
--- a/tests/src/integration/runtimetests/src/helloworld/index.js
+++ b/tests/src/integration/runtimetests/src/helloworld/index.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 function helloworld(params) {
     var format = require('string-format');
diff --git a/tests/src/integration/triggerrule/deployment.yml b/tests/src/integration/triggerrule/deployment.yml
index 6f9e214..1fad02b 100644
--- a/tests/src/integration/triggerrule/deployment.yml
+++ b/tests/src/integration/triggerrule/deployment.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/triggerrule/manifest.yml b/tests/src/integration/triggerrule/manifest.yml
index cee3974..83468ea 100644
--- a/tests/src/integration/triggerrule/manifest.yml
+++ b/tests/src/integration/triggerrule/manifest.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/triggerrule/src/greeting.js b/tests/src/integration/triggerrule/src/greeting.js
index 5c01d98..e6842c7 100644
--- a/tests/src/integration/triggerrule/src/greeting.js
+++ b/tests/src/integration/triggerrule/src/greeting.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a simple greeting message for someone.
diff --git a/tests/src/integration/validate-action-annotations/actions/hello.js b/tests/src/integration/validate-action-annotations/actions/hello.js
index 25fdafb..30a7392 100644
--- a/tests/src/integration/validate-action-annotations/actions/hello.js
+++ b/tests/src/integration/validate-action-annotations/actions/hello.js
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 /*
diff --git a/tests/src/integration/validate-action-annotations/deployment.yaml b/tests/src/integration/validate-action-annotations/deployment.yaml
index 9d50ab2..ea01689 100644
--- a/tests/src/integration/validate-action-annotations/deployment.yaml
+++ b/tests/src/integration/validate-action-annotations/deployment.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/validate-action-annotations/manifest.yaml b/tests/src/integration/validate-action-annotations/manifest.yaml
index 3766f5c..b1e57ef 100644
--- a/tests/src/integration/validate-action-annotations/manifest.yaml
+++ b/tests/src/integration/validate-action-annotations/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/validate-binding-inputs-annotations/actions/helloworld.js b/tests/src/integration/validate-binding-inputs-annotations/actions/helloworld.js
index 5c01d98..e6842c7 100644
--- a/tests/src/integration/validate-binding-inputs-annotations/actions/helloworld.js
+++ b/tests/src/integration/validate-binding-inputs-annotations/actions/helloworld.js
@@ -1,23 +1,7 @@
 /*
- *
- * 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.
- *
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a simple greeting message for someone.
diff --git a/tests/src/integration/validate-binding-inputs-annotations/deployment.yaml b/tests/src/integration/validate-binding-inputs-annotations/deployment.yaml
index a3709b5..34f23dd 100644
--- a/tests/src/integration/validate-binding-inputs-annotations/deployment.yaml
+++ b/tests/src/integration/validate-binding-inputs-annotations/deployment.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/validate-binding-inputs-annotations/manifest.yaml b/tests/src/integration/validate-binding-inputs-annotations/manifest.yaml
index f6f2bbc..93ca76e 100644
--- a/tests/src/integration/validate-binding-inputs-annotations/manifest.yaml
+++ b/tests/src/integration/validate-binding-inputs-annotations/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/actions/hello.js b/tests/src/integration/validate-manifest-deployment-file-extensions/actions/hello.js
index 25fdafb..c04bfdd 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/actions/hello.js
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/actions/hello.js
@@ -1,21 +1,8 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
-
-/*
+ /*
  * Return a simple greeting message for the whole world.
  */
 function main(params) {
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yaml
index 39880f4..124076b 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yaml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yml b/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yml
index deb952e..4f9bdae 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yaml
index 5900052..6ed4975 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yaml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yml b/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yml
index 5674d84..8e900a8 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-deployment.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-deployment.yaml
index b793f81..7944187 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-deployment.yaml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-deployment.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-manifest.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-manifest.yaml
index 287e90b..9916257 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-manifest.yaml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-manifest.yaml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-1.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-1.yaml
index 416f425..ee33556 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-1.yaml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-1.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 packages:
   ValidateRandomFileNames:
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-2.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-2.yaml
index 2f1cfc5..3081015 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-2.yaml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-2.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 project:
   name: IntegrationTest
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-deployment-with-yml-manifest.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-deployment-with-yml-manifest.yaml
index 6fbe7c2..b567bb3 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-deployment-with-yml-manifest.yaml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-deployment-with-yml-manifest.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 project:
   name: IntegrationTest
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-manifest-with-yml-deployment.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-manifest-with-yml-deployment.yaml
index bb85f01..d35d014 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-manifest-with-yml-deployment.yaml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-manifest-with-yml-deployment.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 packages:
   ValidateYAMLManifestWithYMLDeployment:
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/yml-deployment-with-yaml-manifest.yml b/tests/src/integration/validate-manifest-deployment-file-extensions/yml-deployment-with-yaml-manifest.yml
index 54b3400..ae9bd2f 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/yml-deployment-with-yaml-manifest.yml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/yml-deployment-with-yaml-manifest.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/yml-manifest-with-yaml-deployment.yml b/tests/src/integration/validate-manifest-deployment-file-extensions/yml-manifest-with-yaml-deployment.yml
index f3744ca..d80f162 100644
--- a/tests/src/integration/validate-manifest-deployment-file-extensions/yml-manifest-with-yaml-deployment.yml
+++ b/tests/src/integration/validate-manifest-deployment-file-extensions/yml-manifest-with-yaml-deployment.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/validate-packages-in-manifest/actions/hello.js b/tests/src/integration/validate-packages-in-manifest/actions/hello.js
index 25fdafb..30a7392 100644
--- a/tests/src/integration/validate-packages-in-manifest/actions/hello.js
+++ b/tests/src/integration/validate-packages-in-manifest/actions/hello.js
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 /*
diff --git a/tests/src/integration/validate-packages-in-manifest/actions/hello.py b/tests/src/integration/validate-packages-in-manifest/actions/hello.py
index 44c3bd1..1b41955 100644
--- a/tests/src/integration/validate-packages-in-manifest/actions/hello.py
+++ b/tests/src/integration/validate-packages-in-manifest/actions/hello.py
@@ -1,18 +1,6 @@
 #
-# 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.
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 def main(args):
diff --git a/tests/src/integration/validate-packages-in-manifest/deployment.yaml b/tests/src/integration/validate-packages-in-manifest/deployment.yaml
index e40be40..0a5f297 100644
--- a/tests/src/integration/validate-packages-in-manifest/deployment.yaml
+++ b/tests/src/integration/validate-packages-in-manifest/deployment.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 project:
   name: IntegrationTest
diff --git a/tests/src/integration/validate-packages-in-manifest/manifest.yaml b/tests/src/integration/validate-packages-in-manifest/manifest.yaml
index 237d4a2..6c1018a 100644
--- a/tests/src/integration/validate-packages-in-manifest/manifest.yaml
+++ b/tests/src/integration/validate-packages-in-manifest/manifest.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 packages:
     packageNodeJS:
diff --git a/tests/src/integration/validate-project/actions/hello.js b/tests/src/integration/validate-project/actions/hello.js
index 25fdafb..30a7392 100644
--- a/tests/src/integration/validate-project/actions/hello.js
+++ b/tests/src/integration/validate-project/actions/hello.js
@@ -1,18 +1,6 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
  */
 
 /*
diff --git a/tests/src/integration/validate-project/deployment.yaml b/tests/src/integration/validate-project/deployment.yaml
index 8d32db5..e08c037 100644
--- a/tests/src/integration/validate-project/deployment.yaml
+++ b/tests/src/integration/validate-project/deployment.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 project:
   name: IntegrationTest
diff --git a/tests/src/integration/validate-project/manifest.yaml b/tests/src/integration/validate-project/manifest.yaml
index dd07cfc..74bd92d 100644
--- a/tests/src/integration/validate-project/manifest.yaml
+++ b/tests/src/integration/validate-project/manifest.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 packages:
     packageValidatingProject:
diff --git a/tests/src/integration/validatePackagesInDeployment/actions/helloworld.js b/tests/src/integration/validatePackagesInDeployment/actions/helloworld.js
index 2e5a044..e6842c7 100644
--- a/tests/src/integration/validatePackagesInDeployment/actions/helloworld.js
+++ b/tests/src/integration/validatePackagesInDeployment/actions/helloworld.js
@@ -1,5 +1,7 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor
-// license agreements; and to You under the Apache License, Version 2.0.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a simple greeting message for someone.
diff --git a/tests/src/integration/validatePackagesInDeployment/deployment.yaml b/tests/src/integration/validatePackagesInDeployment/deployment.yaml
index cd26a54..4eaf7ac 100644
--- a/tests/src/integration/validatePackagesInDeployment/deployment.yaml
+++ b/tests/src/integration/validatePackagesInDeployment/deployment.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 project:
   name: IntegrationTestPackagesInDeployment
diff --git a/tests/src/integration/validatePackagesInDeployment/manifest.yaml b/tests/src/integration/validatePackagesInDeployment/manifest.yaml
index ad727db..1756a4b 100644
--- a/tests/src/integration/validatePackagesInDeployment/manifest.yaml
+++ b/tests/src/integration/validatePackagesInDeployment/manifest.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 packages:
   TestPackagesInDeploymentFile:
diff --git a/tests/src/integration/validateSequencesCreation/actions/function.js b/tests/src/integration/validateSequencesCreation/actions/function.js
index 4ec2e12..31d3b33 100644
--- a/tests/src/integration/validateSequencesCreation/actions/function.js
+++ b/tests/src/integration/validateSequencesCreation/actions/function.js
@@ -1,5 +1,7 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor
-// license agreements; and to You under the Apache License, Version 2.0.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a simple string to
diff --git a/tests/src/integration/webaction/manifest.yml b/tests/src/integration/webaction/manifest.yml
index b06f4b7..d6db553 100644
--- a/tests/src/integration/webaction/manifest.yml
+++ b/tests/src/integration/webaction/manifest.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:
diff --git a/tests/src/integration/webaction/src/greeting.js b/tests/src/integration/webaction/src/greeting.js
index 2e5a044..e6842c7 100644
--- a/tests/src/integration/webaction/src/greeting.js
+++ b/tests/src/integration/webaction/src/greeting.js
@@ -1,5 +1,7 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor
-// license agreements; and to You under the Apache License, Version 2.0.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a simple greeting message for someone.
diff --git a/tests/src/integration/websequence/manifest.yaml b/tests/src/integration/websequence/manifest.yaml
index 0480c84..279719f 100644
--- a/tests/src/integration/websequence/manifest.yaml
+++ b/tests/src/integration/websequence/manifest.yaml
@@ -1,5 +1,7 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
+#
 
 packages:
     IntegrationTestWebSequence:
diff --git a/tests/src/integration/websequence/src/greeting.js b/tests/src/integration/websequence/src/greeting.js
index 2e5a044..e6842c7 100644
--- a/tests/src/integration/websequence/src/greeting.js
+++ b/tests/src/integration/websequence/src/greeting.js
@@ -1,5 +1,7 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor
-// license agreements; and to You under the Apache License, Version 2.0.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 /**
  * Return a simple greeting message for someone.
diff --git a/tests/src/integration/zipaction/actions/cat/index.js b/tests/src/integration/zipaction/actions/cat/index.js
index 89d0f48..862212a 100644
--- a/tests/src/integration/zipaction/actions/cat/index.js
+++ b/tests/src/integration/zipaction/actions/cat/index.js
@@ -1,5 +1,7 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor
-// license agreements; and to You under the Apache License, Version 2.0.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 function myAction(args) {
     var cat = require('cat');
diff --git a/tests/src/integration/zipaction/actions/cat/node_modules/cat/bin.js b/tests/src/integration/zipaction/actions/cat/node_modules/cat/bin.js
index 697d1f6..0732b5b 100755
--- a/tests/src/integration/zipaction/actions/cat/node_modules/cat/bin.js
+++ b/tests/src/integration/zipaction/actions/cat/node_modules/cat/bin.js
@@ -1,6 +1,8 @@
 #!/usr/bin/env node
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor
-// license agreements; and to You under the Apache License, Version 2.0.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 var fs = require('fs')
 
diff --git a/tests/src/integration/zipaction/actions/cat/node_modules/cat/example.js b/tests/src/integration/zipaction/actions/cat/node_modules/cat/example.js
index 4a6e857..35fc929 100644
--- a/tests/src/integration/zipaction/actions/cat/node_modules/cat/example.js
+++ b/tests/src/integration/zipaction/actions/cat/node_modules/cat/example.js
@@ -1,5 +1,7 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor
-// license agreements; and to You under the Apache License, Version 2.0.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 var cat = require('./index');
 
diff --git a/tests/src/integration/zipaction/actions/cat/node_modules/cat/index.js b/tests/src/integration/zipaction/actions/cat/node_modules/cat/index.js
index 49f2e48..3d864f7 100644
--- a/tests/src/integration/zipaction/actions/cat/node_modules/cat/index.js
+++ b/tests/src/integration/zipaction/actions/cat/node_modules/cat/index.js
@@ -1,5 +1,7 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor
-// license agreements; and to You under the Apache License, Version 2.0.
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ * license agreements; and to You under the Apache License, Version 2.0.
+ */
 
 var fs = require('fs');
 var parse = require('url').parse;
diff --git a/tests/src/integration/zipaction/deployment.yml b/tests/src/integration/zipaction/deployment.yml
index d2eb040..1e256e9 100644
--- a/tests/src/integration/zipaction/deployment.yml
+++ b/tests/src/integration/zipaction/deployment.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 project:
diff --git a/tests/src/integration/zipaction/manifest.yml b/tests/src/integration/zipaction/manifest.yml
index 0d9d3f2..d3b8c25 100644
--- a/tests/src/integration/zipaction/manifest.yml
+++ b/tests/src/integration/zipaction/manifest.yml
@@ -1,17 +1,6 @@
 #
 # 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.
+# license agreements; and to You under the Apache License, Version 2.0.
 #
 
 packages:

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