diff --git a/LICENSE b/LICENSE index f868eadca1..828d3633f7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2014-2018 Google, Inc. http://angular.io +Copyright (c) 2010-2019 Google LLC. http://angular.io/license Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/aio/content/license.md b/aio/content/license.md index 35f5cedfba..8968896025 100644 --- a/aio/content/license.md +++ b/aio/content/license.md @@ -2,7 +2,7 @@ @description The MIT License -Copyright (c) 2014-2018 Google, Inc. +Copyright (c) 2010-2019 Google LLC. http://angular.io/license Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/aio/src/app/layout/footer/footer.component.html b/aio/src/app/layout/footer/footer.component.html index 2e1f835fbe..9c5b24d74f 100644 --- a/aio/src/app/layout/footer/footer.component.html +++ b/aio/src/app/layout/footer/footer.component.html @@ -1,23 +1,20 @@ - -
- Powered by Google ©2010-2018. - Code licensed under an MIT-style License. - Documentation licensed under - CC BY 4.0. -
-- Version {{versionInfo?.full}}. -
- ++ Super-powered by Google ©2010-2019. + Code licensed under an MIT-style License. + Documentation licensed under + CC BY 4.0. +
++ Version {{versionInfo?.full}}. +
\ No newline at end of file diff --git a/aio/src/app/search/search.service.ts b/aio/src/app/search/search.service.ts index cd37900402..03a463eb5c 100644 --- a/aio/src/app/search/search.service.ts +++ b/aio/src/app/search/search.service.ts @@ -1,9 +1,3 @@ -/* -Copyright 2016 Google Inc. All Rights Reserved. -Use of this source code is governed by an MIT-style license that -can be found in the LICENSE file at http://angular.io/license -*/ - import { NgZone, Injectable } from '@angular/core'; import { ConnectableObservable, Observable, race, ReplaySubject, timer } from 'rxjs'; import { concatMap, first, publishReplay } from 'rxjs/operators'; diff --git a/aio/src/app/shared/web-worker.ts b/aio/src/app/shared/web-worker.ts index 464e32fe07..07e545c5b6 100644 --- a/aio/src/app/shared/web-worker.ts +++ b/aio/src/app/shared/web-worker.ts @@ -1,9 +1,3 @@ -/* -Copyright 2016 Google Inc. All Rights Reserved. -Use of this source code is governed by an MIT-style license that -can be found in the LICENSE file at http://angular.io/license -*/ - import {NgZone} from '@angular/core'; import {Observable} from 'rxjs'; diff --git a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.build.js b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.build.js index e1fbdf49b3..27547d8dbe 100644 --- a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.build.js +++ b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.build.js @@ -1,3 +1,10 @@ +/* +Copyright Google LLC. All Rights Reserved. +Use of this source code is governed by an MIT-style license that +can be found in the LICENSE file at http://angular.io/license +*/ + + /** * WEB VERSION FOR CURRENT ANGULAR BUILD * (based on systemjs.config.js in angular.io) @@ -94,9 +101,3 @@ }); })(this); - -/* -Copyright 2016 Google Inc. All Rights Reserved. -Use of this source code is governed by an MIT-style license that -can be found in the LICENSE file at http://angular.io/license -*/ diff --git a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.js b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.js index f8169ffa1a..d97df093d3 100644 --- a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.js +++ b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.js @@ -1,3 +1,9 @@ +/* +Copyright Google LLC. All Rights Reserved. +Use of this source code is governed by an MIT-style license that +can be found in the LICENSE file at http://angular.io/license +*/ + /** * WEB ANGULAR VERSION * (based on systemjs.config.js in angular.io) @@ -80,9 +86,3 @@ }); })(this); - -/* -Copyright 2016 Google Inc. All Rights Reserved. -Use of this source code is governed by an MIT-style license that -can be found in the LICENSE file at http://angular.io/license -*/ diff --git a/aio/tools/stackblitz-builder/builder.js b/aio/tools/stackblitz-builder/builder.js index a738b2eca3..35ad2b2745 100644 --- a/aio/tools/stackblitz-builder/builder.js +++ b/aio/tools/stackblitz-builder/builder.js @@ -51,9 +51,9 @@ class StackblitzBuilder { } _buildCopyrightStrings() { - var copyright = 'Copyright 2017-2018 Google Inc. All Rights Reserved.\n' - + 'Use of this source code is governed by an MIT-style license that\n' - + 'can be found in the LICENSE file at http://angular.io/license'; + var copyright = 'Copyright Google LLC. All Rights Reserved.\n' + + 'Use of this source code is governed by an MIT-style license that\n' + + 'can be found in the LICENSE file at http://angular.io/license'; var pad = '\n\n'; this.copyrights.jsCss = `${pad}/*\n${copyright}\n*/`; this.copyrights.html = `${pad}`; diff --git a/packages/bazel/test/ng_package/example_package.golden b/packages/bazel/test/ng_package/example_package.golden index 7db2e126cb..eece9c982c 100644 --- a/packages/bazel/test/ng_package/example_package.golden +++ b/packages/bazel/test/ng_package/example_package.golden @@ -91,7 +91,7 @@ Hello /** * @license Angular v0.0.0 - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ @@ -165,7 +165,7 @@ Hello /** * @license Angular v0.0.0 - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("@angular/core")):"function"==typeof define&&define.amd?define("example/secondary",["exports","@angular/core"],t):t(((e=e||self).example=e.example||{},e.example.secondary={}),e.ng.core)}(this,function(e,t){"use strict"; @@ -190,7 +190,7 @@ e.SecondaryModule=o,e.a=1,Object.defineProperty(e,"__esModule",{value:!0})}); /** * @license Angular v0.0.0 - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ @@ -262,7 +262,7 @@ e.SecondaryModule=o,e.a=1,Object.defineProperty(e,"__esModule",{value:!0})}); /** * @license Angular v0.0.0 - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("@angular/core")):"function"==typeof define&&define.amd?define("example",["exports","@angular/core"],t):t((e=e||self).example={},e.ng.core)}(this,function(e,t){"use strict"; @@ -502,7 +502,7 @@ export * from './index'; /** * @license Angular v0.0.0 - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ @@ -537,7 +537,7 @@ export { SecondaryModule, a }; /** * @license Angular v0.0.0 - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ @@ -570,7 +570,7 @@ export { MyModule }; /** * @license Angular v0.0.0 - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ @@ -614,7 +614,7 @@ export { SecondaryModule, a }; /** * @license Angular v0.0.0 - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ @@ -749,7 +749,7 @@ export declare const a = 1; /** * @license Angular v0.0.0 - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ diff --git a/packages/language-service/bundles/banner.js.txt b/packages/language-service/bundles/banner.js.txt index 82e0ee92b0..3224f53c79 100644 --- a/packages/language-service/bundles/banner.js.txt +++ b/packages/language-service/bundles/banner.js.txt @@ -1,6 +1,6 @@ /** * @license Angular v0.0.0-PLACEHOLDER - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ diff --git a/packages/license-banner.txt b/packages/license-banner.txt index 5e6eac320c..f7aafb73f8 100644 --- a/packages/license-banner.txt +++ b/packages/license-banner.txt @@ -1,5 +1,5 @@ /** * @license Angular v0.0.0-PLACEHOLDER - * (c) 2010-2018 Google, Inc. https://angular.io/ + * (c) 2010-2019 Google LLC. https://angular.io/ * License: MIT */ diff --git a/packages/router/LICENSE b/packages/router/LICENSE deleted file mode 100644 index 26db104f5f..0000000000 --- a/packages/router/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2017-2018 Google, Inc. http://angular.io - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file