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

[GitHub] mrutkows closed pull request #910: Fix for 909

mrutkows closed pull request #910: Fix for 909
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/910
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/tests/apps/openwhisk-githubslackbot/manifest.yaml b/tests/apps/openwhisk-githubslackbot/manifest.yaml
index f91b1cdc..a4c76c7c 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 1b1d80a2..7d3a7c3f 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 2ca5f5ea..932d94e6 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 e245debc..7a625805 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 e0950753..30057812 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 3d48b81c..e0e4c163 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 3e0c73bf..ebfac08c 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 e6eb4474..16c8000d 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 c8e12334..aab07d8f 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 0b849d6c..d3caa6aa 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 0c37906d..9b547c3c 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 7814daf4..52152a0d 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 6080f979..ac33bcab 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 bcef972e..1dcca9c8 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 31749b0c..34e8919b 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 54d6fdfe..c88f391b 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 9d50ab2a..ea016896 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 b1eb4247..2f8db92c 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 0f1b0248..3ef2dc2c 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 295e7b99..dee77f96 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 936baea0..955c1bd5 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 9c6812ea..4326359c 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 5736f104..b43d545b 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 588cab14..826e9f11 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 7fb98193..65bf492d 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 2f42fd5c..e3078fc9 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 8c9316c3..990c14a1 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 f601c27a..d4f995f2 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 d45ba581..43aa1d81 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 2a4f84a8..9a690b94 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 9ab90126..b510a09d 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 729c6191..b1121b47 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 c6eb5092..42e121a4 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 6191a1f1..599cef06 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 2b433494..38be5256 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 1ec2a946..0814a318 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 d83d09c5..4fde9379 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 192d722d..6724cb8a 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 f68f90ba..e5886f8d 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 44d5653e..b892ad8f 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 b92f5922..1062012c 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 e845ce19..5bea498a 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 ac025954..ecd39d6b 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 20618f29..32cc5cff 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 70f31e86..53f30bc2 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 4e96c1e9..32c006c4 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 ab0e2368..3248c84d 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 0eaf7eda..f8800e0a 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 8faf05f8..fb434269 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 123b2a62..ecc1473f 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 d18e95b1..03dec64e 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 300cdad0..23541359 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 f75c3b1b..78c8155c 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 29be42ea..079066f6 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 6240bcd3..13bb49d6 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 57030d05..6209ee7b 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 5877dc6b..4111d740 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 15ce7b86..db8f6d54 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 8e4fac0b..1f1d8e5b 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 ea5f2531..f8bc192b 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 7ace84eb..2674a418 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 e46969dd..cb23b863 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 587929fa..498e53e9 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 4d5425d0..589e800e 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 fb7cca88..e1921dbc 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 0bed2abd..98bf3b85 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 680a8671..9b610486 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 2b3b2c23..70542ac4 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 fa7ee81a..80a9062d 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 9fa96238..fefbd505 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 de99908e..633041b0 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 5c22af24..9e93317d 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 32d65579..ed051cdd 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 6189d89a..59d256f7 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 f0eb0b51..f5f7a74f 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 2946d955..df77d2c8 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 8b5c49be..a798c7d9 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 7b4f712c..b003defc 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 30a88d41..0d2a610b 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 e4e8cb65..f8ab5b5a 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 ef3877dc..3a6c1a94 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 0636d1cc..611a202e 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 db5bcdb9..865f848f 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 7e8ce4f0..20b75c58 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 b1357b33..b4efbea6 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 536a1c84..f58400cd 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 6b574597..6890fab8 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 df768fdd..4193c177 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 70606e5a..d860504a 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 44329389..cce928fb 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 b0dcfb8f..0f20c050 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 446d90b2..be21e9b6 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 e9dab41e..ffd5fad6 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 2e5a0443..e6842c73 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 40766336..2bad8a68 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 fc20d661..18112a0c 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 cd5f129a..b1dddfbd 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 5c01d98b..e6842c73 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 25fdafbc..30a73925 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 44c3bd14..1b41955a 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 6e591f35..d0e5a788 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 374dde07..4543f06e 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 b173abd0..d43e1f16 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 8581d433..2cf651e4 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 33b2396b..fb3a10e2 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 c9ba2bd5..8bd694f1 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 6aed69c9..d1e6a454 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 1fae1a48..561bd486 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 88012b48..9c8f2be5 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 0e5ea08a..6b9b151b 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 cf2b1c8e..dd32ce19 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 b23bbadb..4bed458b 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 f9cb7828..190a592b 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 612feeb1..d18e8c1d 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 25fdafbc..30a73925 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 50f5a62e..e3da4f04 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 90a4ae03..ff8a8509 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 facc7f1a..189c0d9c 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 92b7f43b..6cca04be 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 10ed0b2d..748ef9ee 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 6dcafad5..b812f4f0 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 f0eb0b51..f5f7a74f 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 6f2fb982..7724d778 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 f26426f6..8b466d7e 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 ca5dd97a..0d6c3e59 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 605c313c..878bfd6f 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 6f9e2141..1fad02b6 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 cee39743..83468ea5 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 5c01d98b..e6842c73 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 25fdafbc..30a73925 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 9d50ab2a..ea016896 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 3766f5cf..b1e57ef9 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 5c01d98b..e6842c73 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 a3709b5d..34f23ddf 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 f6f2bbce..93ca76e5 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 25fdafbc..c04bfdd4 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 39880f4e..124076b3 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 deb952e2..4f9bdae3 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 5900052b..6ed4975a 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 5674d84f..8e900a86 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 b793f818..79441879 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 287e90b3..99162573 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 416f4253..ee33556f 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 2f1cfc5c..30810157 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 6fbe7c2f..b567bb34 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 bb85f011..d35d0142 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 54b34000..ae9bd2f7 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 f3744ca5..d80f1626 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 25fdafbc..30a73925 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 44c3bd14..1b41955a 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 e40be40f..0a5f2977 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 237d4a25..6c1018a4 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 25fdafbc..30a73925 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 8d32db52..e08c037b 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 dd07cfc2..74bd92d9 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 2e5a0443..e6842c73 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 cd26a540..4eaf7ace 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 ad727dbd..1756a4b7 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 4ec2e123..31d3b33f 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 b06f4b72..d6db5531 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 2e5a0443..e6842c73 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 0480c841..279719fb 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 2e5a0443..e6842c73 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 89d0f487..862212a0 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 697d1f68..0732b5bc 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 4a6e857c..35fc9296 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 49f2e48a..3d864f7d 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 d2eb0409..1e256e9a 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 0d9d3f25..d3b8c25d 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:


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services