From 33319f25790f478cd8e6be15cb1da4e29d83f03d Mon Sep 17 00:00:00 2001 From: Emily Jiang Date: Mon, 27 Sep 2021 15:58:11 +0100 Subject: [PATCH] Fix licenses and update dependencies (#225) * Fix licenses and update dependencies --- .../main/javadoc/licenses/Draft/license.html | 27 ------ .../main/javadoc/licenses/Final/license.html | 72 ---------------- pom.xml | 4 +- tck/{running_the_tck.asciidoc => README.adoc} | 0 tck/base/pom.xml | 24 +++++- tck/base/src/main/resources/META-INF/tck | 0 tck/licenses/Final/LICENSE | 83 ------------------- tck/rest-client/pom.xml | 23 +++++ .../src/main/resources/META-INF}/LICENSE | 0 .../src/main/resources/META-INF/NOTICE | 16 ++++ .../src/main/resources/META-INF/tck | 0 11 files changed, 64 insertions(+), 185 deletions(-) delete mode 100644 api/src/main/javadoc/licenses/Draft/license.html delete mode 100644 api/src/main/javadoc/licenses/Final/license.html rename tck/{running_the_tck.asciidoc => README.adoc} (100%) create mode 100644 tck/base/src/main/resources/META-INF/tck delete mode 100644 tck/licenses/Final/LICENSE rename tck/{licenses/Draft => rest-client/src/main/resources/META-INF}/LICENSE (100%) create mode 100644 tck/rest-client/src/main/resources/META-INF/NOTICE create mode 100644 tck/rest-client/src/main/resources/META-INF/tck diff --git a/api/src/main/javadoc/licenses/Draft/license.html b/api/src/main/javadoc/licenses/Draft/license.html deleted file mode 100644 index 994b5f8..0000000 --- a/api/src/main/javadoc/licenses/Draft/license.html +++ /dev/null @@ -1,27 +0,0 @@ - - -Apache License - Version 2 - - -

Apache License - Version 2

-

-Copyright (c) ${inceptionYear}-${currentYear} Contributors to the Eclipse Foundation -

-

-Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at -

-

- - http://www.apache.org/licenses/LICENSE-2.0 -

-

-Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -

- - \ No newline at end of file diff --git a/api/src/main/javadoc/licenses/Final/license.html b/api/src/main/javadoc/licenses/Final/license.html deleted file mode 100644 index be52b4f..0000000 --- a/api/src/main/javadoc/licenses/Final/license.html +++ /dev/null @@ -1,72 +0,0 @@ - - -Eclipse Foundation Specification License - v1.0 - - -

Eclipse Foundation Specification License - v1.0

-

By using and/or copying this document, or the Eclipse Foundation - document from which this statement is linked, you (the licensee) agree - that you have read, understood, and will comply with the following - terms and conditions:

- -

Permission to copy, and distribute the contents of this document, or - the Eclipse Foundation document from which this statement is linked, in - any medium for any purpose and without fee or royalty is hereby - granted, provided that you include the following on ALL copies of the - document, or portions thereof, that you use:

- - - -

Inclusion of the full text of this NOTICE must be provided. We - request that authorship attribution be provided in any software, - documents, or other items or products that you create pursuant to the - implementation of the contents of this document, or any portion - thereof.

- -

No right to create modifications or derivatives of Eclipse Foundation - documents is granted pursuant to this license, except anyone may - prepare and distribute derivative works and portions of this document - in software that implements the specification, in supporting materials - accompanying such software, and in documentation of such software, - PROVIDED that all such works include the notice below. HOWEVER, the - publication of derivative works of this document for use as a technical - specification is expressly prohibited.

- -

The notice is:

- -

"Copyright © [$date-of-document] Eclipse Foundation. This software or - document includes material copied from or derived from [title and URI - of the Eclipse Foundation specification document]."

- -

Disclaimers

- -

THIS DOCUMENT IS PROVIDED "AS IS," AND THE COPYRIGHT - HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR - WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, - WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, - NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE - SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS - WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR - OTHER RIGHTS.

- -

THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE - FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT - OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE - CONTENTS THEREOF.

- -

The name and trademarks of the copyright holders or the Eclipse - Foundation may NOT be used in advertising or publicity pertaining to - this document or its contents without specific, written prior - permission. Title to copyright in this document will at all times - remain with copyright holders.

- - - diff --git a/pom.xml b/pom.xml index 312ef54..a7ca231 100644 --- a/pom.xml +++ b/pom.xml @@ -32,8 +32,8 @@ http://microprofile.io - 3.0-RC4 - 3.0-RC2 + 3.0-RC5 + 3.0-RC3 0.33.0 1.1.0 diff --git a/tck/running_the_tck.asciidoc b/tck/README.adoc similarity index 100% rename from tck/running_the_tck.asciidoc rename to tck/README.adoc diff --git a/tck/base/pom.xml b/tck/base/pom.xml index c400f10..fede3ac 100644 --- a/tck/base/pom.xml +++ b/tck/base/pom.xml @@ -77,5 +77,27 @@ opentracing-api - + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + ${version.plugin.copy.rename} + + + copy-readme + prepare-package + + copy + + + ../README.adoc + target/classes/README.adoc + + + + + + + diff --git a/tck/base/src/main/resources/META-INF/tck b/tck/base/src/main/resources/META-INF/tck new file mode 100644 index 0000000..e69de29 diff --git a/tck/licenses/Final/LICENSE b/tck/licenses/Final/LICENSE deleted file mode 100644 index c858c0a..0000000 --- a/tck/licenses/Final/LICENSE +++ /dev/null @@ -1,83 +0,0 @@ -Eclipse Foundation Technology Compatibility Kit License - v 1.0 - -Copyright (c) 2018, Eclipse Foundation, Inc. and its licensors. - -Redistribution and use in binary form is permitted provided that the -following conditions are met: - -1. Use of the Technology Compatibility Kit accompanying this license - (the "TCK") and its documentation is permitted solely for the - purpose of testing compatibility of an implementation (the - "Product") of a specification (the "Specification") made available - by the Eclipse Foundation, Inc. ("Eclipse"). - -2. Only those modifications expressly permitted by the TCK and its - documentation are permitted. Except in these limited circumstances, - no modifications to the TCK are permitted under this license. - -3. A Product will be deemed to be "compatible" with the Specification - if it fully and completely meets and satisfies all requirements of - the TCK. - -4. Before any claim of compatibility (or any similar claim suggesting - compatibility) is made based on the TCK, the testing party must: - - a. use the TCK to demonstrate that the Product fully and - completely meets and satisfies all requirements of the TCK; - - b. make TCK test results showing full and complete satisfaction of - all requirements of the TCK publicly available on the testing - party's website and send a link to such test results to Eclipse - at [tck@eclipse.org](mailto:tck@eclipse.org); and - - c. comply with any requirements stated in the Specification with - regard to subsetting, supersetting, modifying or extending the - Specification in any Product claimed to be compatible with the - Specification. - -5. The test results must be continuously available and the link must - be live for at least as long as the Product is available in the - marketplace. - -6. The TCK may not be used as a basis for any statements of partial - compatibility. The TCK may only be used as a basis for true, - factual statements of full compatibility of Products that fully - meet and satisfy all requirements of the TCK. - -7. A determination that a Product is compatible with the TCK does not, - in itself, give rise to the right to use any name, mark, logo - associated with the TCK, Eclipse, or Eclipse's contributors or - licensors. - -8. Upon the request of Eclipse, a tester will retract any statements - of compatibility (or any similar claim suggesting compatibility) - which Eclipse reasonably determines to be false or misleading or in - violation of the terms of this license. - -9. Redistribution of the TCK must be under this Eclipse Foundation - Technology Compatibility Kit License and must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - -10. Neither the name, trademarks or logos of Eclipse, nor the names, - trademarks or logos of its contributors or licensors may be used to - endorse or promote products tested with this software without - specific prior written permission. - -11. The source code for the TCK accompanying this license is available - from Eclipse. - -TO THE EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED ON -AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER -EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR -CONDITIONS OF TITLE, NON- INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR -A PARTICULAR PURPOSE. TO THE EXTENT PERMITTED BY APPLICABLE LAW, -NEITHER THE COPYRIGHT OWNER OR ANY CONTRIBUTORS SHALL HAVE ANY -LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE -EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. diff --git a/tck/rest-client/pom.xml b/tck/rest-client/pom.xml index 2e21c37..2e8f901 100644 --- a/tck/rest-client/pom.xml +++ b/tck/rest-client/pom.xml @@ -58,4 +58,27 @@ provided + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + ${version.plugin.copy.rename} + + + copy-readme + prepare-package + + copy + + + ../README.adoc + target/classes/README.adoc + + + + + + + diff --git a/tck/licenses/Draft/LICENSE b/tck/rest-client/src/main/resources/META-INF/LICENSE similarity index 100% rename from tck/licenses/Draft/LICENSE rename to tck/rest-client/src/main/resources/META-INF/LICENSE diff --git a/tck/rest-client/src/main/resources/META-INF/NOTICE b/tck/rest-client/src/main/resources/META-INF/NOTICE new file mode 100644 index 0000000..b0ec429 --- /dev/null +++ b/tck/rest-client/src/main/resources/META-INF/NOTICE @@ -0,0 +1,16 @@ +========================================================================= +== NOTICE file corresponding to section 4(d) of the Apache License, == +== Version 2.0, in this case for Microprofile OpenTracing == +========================================================================= + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +SPDXVersion: SPDX-2.1 +PackageName: Eclipse Microprofile +PackageHomePage: http://www.eclipse.org/microprofile +PackageLicenseDeclared: Apache-2.0 + +PackageCopyrightText: +Steve Fontes steve.m.fontes@gmail.com + diff --git a/tck/rest-client/src/main/resources/META-INF/tck b/tck/rest-client/src/main/resources/META-INF/tck new file mode 100644 index 0000000..e69de29