From 9a675912f886b976ee7dd547fdfd3d90efda66dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A8=E3=83=AA=E3=82=B9?= Date: Wed, 15 Apr 2020 12:40:59 +0900 Subject: [PATCH] chore: various cleanup (#957) * chore: various cleanup * update LICENSE year * update third-party appended licenses * update NOTICE year & format * use correct CI badges on README.md * remove extra markdown from RELEASENOTES.md * chore: update reviewboard url --- .reviewboardrc | 2 +- LICENSE | 71 +++++++++++++++++++------------------------------ NOTICE | 14 ++-------- README.md | 19 ++++++------- RELEASENOTES.md | 2 +- 5 files changed, 39 insertions(+), 69 deletions(-) diff --git a/.reviewboardrc b/.reviewboardrc index 30e9587a..9e68a2ee 100644 --- a/.reviewboardrc +++ b/.reviewboardrc @@ -4,5 +4,5 @@ GUESS_FIELDS = True OPEN_BROWSER = True TARGET_GROUPS = 'cordova' -REVIEWBOARD_URL = 'http://reviews.apache.org' +REVIEWBOARD_URL = 'https://reviews.apache.org' diff --git a/LICENSE b/LICENSE index 61af2bb8..292d8769 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2015 Apache Cordova + Copyright 2015-2020 Apache Cordova Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -207,7 +207,7 @@ bin/node_modules/q ================================================================================ -Copyright 2009–2012 Kristopher Michael Kowal. All rights reserved. +Copyright 2009–2017 Kristopher Michael Kowal. All rights reserved. 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 @@ -229,56 +229,39 @@ IN THE SOFTWARE. ================================================================================ bin/node_modules/nopt ================================================================================ -Copyright 2009, 2010, 2011 Isaac Z. Schlueter. -All rights reserved. -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 ISC License -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. +Copyright (c) Isaac Z. Schlueter and Contributors -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. +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ================================================================================ bin/node_modules/which ================================================================================ -Copyright 2009, 2010, 2011 Isaac Z. Schlueter. -All rights reserved. +The ISC 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 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. +Copyright (c) Isaac Z. Schlueter and Contributors +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/NOTICE b/NOTICE index 788ab0b4..2ce6eeec 100644 --- a/NOTICE +++ b/NOTICE @@ -1,15 +1,5 @@ Apache Cordova -Copyright 2015 The Apache Software Foundation +Copyright 2015-2020 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org) - -========================================================================= -== NOTICE file corresponding to the section 4 d of == -== the Apache License, Version 2.0, == -== in this case for the Android-specific code. == -========================================================================= - -This product includes software developed as part of -The Android Open Source Project (http://source.android.com). - +The Apache Software Foundation (http://www.apache.org/). diff --git a/README.md b/README.md index af25fee4..e787ff29 100644 --- a/README.md +++ b/README.md @@ -19,22 +19,21 @@ # --> -[![Build Status](https://travis-ci.org/apache/cordova-android.svg?branch=master)](https://travis-ci.org/apache/cordova-android) -[![codecov.io](https://codecov.io/github/apache/cordova-android/coverage.svg?branch=master)](https://codecov.io/github/apache/cordova-android?branch=master) - # Cordova Android -Cordova Android is an Android application library that allows for Cordova-based -projects to be built for the Android Platform. Cordova based applications are, -at the core, applications written with web technology: HTML, CSS and JavaScript. +[![NPM](https://nodei.co/npm/cordova-android.png)](https://nodei.co/npm/cordova-android/) + +[![Node CI](https://github.com/apache/cordova-android/workflows/Node%20CI/badge.svg?branch=master)](https://github.com/apache/cordova-android/actions?query=branch%3Amaster) +[![codecov.io](https://codecov.io/github/apache/cordova-android/coverage.svg?branch=master)](https://codecov.io/github/apache/cordova-android?branch=master) + +Cordova Android is an Android application library that allows for Cordova-based projects to be built for the Android Platform. Cordova based applications are, at the core, applications written with web technology: HTML, CSS and JavaScript. [Apache Cordova](https://cordova.apache.org) is a project of The Apache Software Foundation (ASF). ## Requires - Java JDK 1.8 -- Android SDK [http://developer.android.com](http://developer.android.com) - +- Android SDK [http://developer.android.com](https://developer.android.com/) ## Cordova Android Developer Tools @@ -61,6 +60,4 @@ These commands live in a generated Cordova Android project. Any interactions wit ## Running the Native Tests -The `test/` directory in this project contains an Android test project that can -be used to run different kinds of native tests. Check out the -[README contained therein](test/README.md) for more details! +The `test/` directory in this project contains an Android test project that can be used to run different kinds of native tests. Check out the [README contained therein](test/README.md) for more details! diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 285310bf..6530a587 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -18,7 +18,7 @@ # under the License. # --> -## Release Notes for Cordova (Android) ## +## Release Notes for Cordova (Android) ### 8.1.0 (Sep 11, 2019)