Changing license header, again!

http://anonscm.debian.org/cgit/collab-maint/devscripts.git/tree/scripts/licensecheck.pl
has a very strict way to guess the Apache license and commit
8e59407 broke the parsing, resulting that
licensecheck.pl didn't detect the files as Apache anymore. This inhibits rolling
the client in chromium's src.git so it has to be fixed.

Ran:

  git sed 's/by the Apache v2.0 license that can be/under the Apache License, Version 2.0/'
  git sed 's/found in the LICENSE file/that can be found in the LICENSE file/'
  git checkout HEAD -- $(git status -sb | grep '^ T' | cut -c 4-)
  git checkout origin/master -- $(git diff origin/master --name-only | grep third_party)
  git checkout origin/master -- appengine/isolate/doc/client/Design.md

then manually edited PRESUBMIT.py.

[email protected]
BUG=

Review-Url: https://codereview.chromium.org/2013943002

PRESUBMIT.py

@@ -1,6 +1,6 @@
 # Copyright 2013 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Top-level presubmit script for LUCI.
 
@@ -17,9 +17,9 @@ def header(input_api):
   license_header = (
     r'.*? Copyright %(year)s The LUCI Authors\. '
       r'All rights reserved\.\n'
-    r'.*? Use of this source code is governed by the Apache v2\.0 license '
-      r'that can be\n'
-    r'.*? found in the LICENSE file\.(?: \*/)?\n'
+    r'.*? Use of this source code is governed under the Apache License, '
+      r'Version 2\.0\n'
+    r'.*? that can be found in the LICENSE file\.(?: \*/)?\n'
   ) % {
     'year': years_re,
   }

WATCHLISTS

@@ -1,6 +1,6 @@
 # Copyright (c) 2013 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 # Watchlist Rules
 # Refer: http://dev.chromium.org/developers/contributing-code/watchlists

appengine/auth_service/PRESUBMIT.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Top-level presubmit script for auth server.
 

appengine/auth_service/acl.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """ACL checks for endpoints exposed by auth_service."""
 

appengine/auth_service/appengine_config.py

@@ -1,6 +1,6 @@
 # Copyright 2013 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Configures includes (components.auth).
 

appengine/auth_service/config.py

@@ -1,6 +1,6 @@
 # Copyright 2015 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Adapter between config service client and the rest of auth_service.
 

appengine/auth_service/config_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2015 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import datetime
 import logging

appengine/auth_service/delegation.py

@@ -1,6 +1,6 @@
 # Copyright 2015 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """API handler to mint delegation tokens."""
 

appengine/auth_service/delegation_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2015 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import json
 import logging

appengine/auth_service/handlers_backend.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """This module defines Auth Server backend url handlers."""
 

appengine/auth_service/handlers_frontend.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """This module defines Auth Server frontend url handlers."""
 

appengine/auth_service/handlers_frontend_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import logging
 import sys

appengine/auth_service/importer.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Imports groups from some external tar.gz bundle or plain text list.
 

appengine/auth_service/importer_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import collections
 import datetime

appengine/auth_service/main_backend.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """This modules is imported by AppEngine and defines the 'app' object.
 

appengine/auth_service/main_frontend.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """This modules is imported by AppEngine and defines the 'app' object.
 

appengine/auth_service/proto/config.proto

@@ -1,6 +1,6 @@
 // Copyright 2015 The LUCI Authors. All rights reserved.
-// Use of this source code is governed by the Apache v2.0 license that can be
-// found in the LICENSE file.
+// Use of this source code is governed under the Apache License, Version 2.0
+// that can be found in the LICENSE file.
 
 // Configuration schema for configs fetched via a config service.
 

appengine/auth_service/pubsub.py

@@ -1,6 +1,6 @@
 # Copyright 2015 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Manages PubSub topic that receives notifications about AuthDB changes.
 

appengine/auth_service/replication.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Primary side of Primary <-> Replica protocol."""
 

appengine/auth_service/replication_smoke_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """High level test for Primary <-> Replica replication logic.
 

appengine/auth_service/static/js/config_page.js

@@ -1,6 +1,6 @@
 // Copyright 2014 The LUCI Authors. All rights reserved.
-// Use of this source code is governed by the Apache v2.0 license that can be
-// found in the LICENSE file.
+// Use of this source code is governed under the Apache License, Version 2.0
+// that can be found in the LICENSE file.
 
 var config_page = (function() {
 'use strict';

appengine/auth_service/static/js/services.js

@@ -1,6 +1,6 @@
 // Copyright 2014 The LUCI Authors. All rights reserved.
-// Use of this source code is governed by the Apache v2.0 license that can be
-// found in the LICENSE file.
+// Use of this source code is governed under the Apache License, Version 2.0
+// that can be found in the LICENSE file.
 
 var services = (function() {
 'use strict';

appengine/auth_service/test_env.py

@@ -1,6 +1,6 @@
 # Copyright 2015 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import os
 import sys

appengine/auth_service/test_replica_app/main.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import webapp2
 

appengine/auth_service/tools/compile_proto.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Compiles all *.proto files it finds into *_pb2.py."""
 

appengine/auth_service/tools/run_coverage.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import os
 import sys

appengine/components/PRESUBMIT.py

@@ -1,6 +1,6 @@
 # Copyright 2013 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Top-level presubmit script for appengine/components/.
 

appengine/components/components/auth/__init__.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Authentication and authorization component.
 

appengine/components/components/auth/api.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Defines main bulk of public API of auth component.
 

appengine/components/components/auth/api_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 # Disable 'Access to a protected member', Unused argument', 'Unused variable'.
 # pylint: disable=W0212,W0612,W0613

appengine/components/components/auth/change_log.py

@@ -1,6 +1,6 @@
 # Copyright 2015 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Models and functions to build and query Auth DB change log."""
 

appengine/components/components/auth/change_log_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import datetime
 import sys

appengine/components/components/auth/config.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Auth component configuration hooks.
 

appengine/components/components/auth/delegation.py

@@ -1,6 +1,6 @@
 # Copyright 2015 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Delegation token implementation.
 

appengine/components/components/auth/delegation_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2015 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import collections
 import datetime

appengine/components/components/auth/endpoints_support.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Integration with Cloud Endpoints.
 

appengine/components/components/auth/endpoints_support_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import logging
 import sys

appengine/components/components/auth/handler.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Integration with webapp2."""
 

appengine/components/components/auth/handler_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 # Disable 'Unused variable', 'Unused argument' and 'Method could be a function'.
 # pylint: disable=W0612,W0613,R0201

appengine/components/components/auth/ipaddr.py

@@ -1,6 +1,6 @@
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 """Utilities for working with IPv4 and IPv6 addresses."""
 

appengine/components/components/auth/ipaddr_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
 
 import sys
 import unittest