From f8bd6d577e43ba0c81f5be240d5282caf780f18d Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Sat, 26 Oct 2019 23:12:04 +0200 Subject: [PATCH] [MNG-6771] Fix license issues on binary distribution - Update slf4j to 1.7.29 - Do not download ASL v2 license files but copy from local - add Jsoup license - keep a specific copy of MIT license for each dependency - Add NOTICE to binary distribution - Add Eclipse SISU about.html contents MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch co-authored by Hervé Boutemy and Enrico Olivelli --- apache-maven/pom.xml | 8 + .../appended-resources/META-INF/LICENSE.vm | 64 +++--- .../appended-resources/META-INF/NOTICE.vm | 116 ++++++++++ .../appended-resources/licenses/ASL-2.0.txt | 202 ++++++++++++++++++ .../licenses/MIT-jsoup-1.12.1.txt | 23 ++ .../licenses/MIT-slf4j-api-1.7.29.txt | 23 ++ .../main/appended-resources/licenses/MIT.txt | 14 -- apache-maven/src/main/assembly/component.xml | 7 + pom.xml | 11 +- 9 files changed, 426 insertions(+), 42 deletions(-) create mode 100644 apache-maven/src/main/appended-resources/META-INF/NOTICE.vm create mode 100644 apache-maven/src/main/appended-resources/licenses/ASL-2.0.txt create mode 100644 apache-maven/src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt create mode 100644 apache-maven/src/main/appended-resources/licenses/MIT-slf4j-api-1.7.29.txt delete mode 100644 apache-maven/src/main/appended-resources/licenses/MIT.txt diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index fb66f713ae0..2696d2399b0 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -79,6 +79,14 @@ under the License. + + + org.jsoup + jsoup + runtime + org.slf4j jcl-over-slf4j diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm index bf36fa7cd64..25ac46f3770 100644 --- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm +++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm @@ -22,50 +22,60 @@ Apache Maven includes a number of components and libraries with separate copyright notices and license terms. Your use of those components are subject to the terms and conditions of the following licenses: ## -#set ( $apacheLicenseNames = [ "Apache License, Version 2.0", "The Apache Software License, Version 2.0", - "ASLv2", "Apache Public License 2.0", "Apache 2.0" ] ) +#set ( $apacheMavenGroupIds = [ "org.apache.maven", "org.apache.maven.wagon", "org.apache.maven.resolver", + "org.apache.maven.shared" ] ) #set ( $MITLicenseNames = [ "MIT License", "MIT license", "The MIT License" ] ) #foreach ( $project in $projects ) #**##foreach ( $license in $project.licenses) -#* *##if ( !$apacheLicenseNames.contains( $license.name ) ) -#* *##set ( $artId = $project.artifact.artifactId ) -#* *##set ( $url = $license.url ) -#* *##set ( $spdx = false ) -#* *##set ( $includeLicense = true ) +#* *##set ( $groupId = $project.artifact.groupId ) +#* *##set ( $directory = 'lib' ) +#* *##if ( !$apacheMavenGroupIds.contains( $groupId ) ) +#* *### advertise about each non-Maven dependency #* *### -#* *##if ( $project.artifact.artifactId == "jcl-over-slf4j" ) -#* *### jcl-over-slf4j is Apache 2.0, even if its pom says MIT -#* *##set ( $includeLicense = false ) -#* *##end +#* *### infer SPDX license code #* *##if ( $license.name == "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0" ) #* *##set ( $spdx = 'CDDL-1.0' ) -#* *##end -#* *##if ( $MITLicenseNames.contains( $license.name ) ) +#* *##elseif ( $MITLicenseNames.contains( $license.name ) ) #* *##set ( $spdx = 'MIT' ) -#* *##end -#* *##if ( $license.name == "Eclipse Public License, Version 1.0" ) +#* *##elseif ( $license.name == "Eclipse Public License, Version 1.0" ) #* *##set ( $spdx = 'EPL-1.0' ) +#* *##elseif ( $license.url.contains( "www.apache.org/licenses/LICENSE-2.0" ) ) +#* *##set ( $spdx = 'ASL-2.0' ) +#* *##else +#* *### unrecognized license will require analysis to know obligations +#* *##set ( $spdx = 'unrecognized' ) #* *##end +#* *### +#* *### fix project urls that are wrong in pom #* *##if ( $project.url.startsWith( "http://www.eclipse.org/sisu/" ) ) #* *##set ( $project.url = 'https://www.eclipse.org/sisu/' ) +#* *##elseif ( $project.url.startsWith( "https://github.com/google/guava/" ) ) +#* *##set ( $project.url = 'https://github.com/google/guava/' ) +#* *##elseif ( $project.url.startsWith( "https://github.com/google/guice/" ) ) +#* *##set ( $project.url = 'https://github.com/google/guice/' ) #* *##end -#* *##if ( $includeLicense ) -#* *##if ( $url || $spdx ) -#* *##set ( $licFile = 'lib/' + $artId + '.license' ) -#* *##if ( $spdx ) -#* *##set ( $downloaded = $locator.getResourceAsFile( "licenses/${spdx}.txt", "licenses/${licFile}" ) ) -#* *##else -#* *##set ( $downloaded = $locator.getResourceAsFile( $url, "licenses/${licFile}" ) ) -#* *##end -#* *##end +#* *### +#* *### Classworlds is in boot directory, not in lib +#* *##if ( $project.artifact.artifactId == "plexus-classworlds" ) +#* *##set ( $directory = 'boot' ) +#* *##end +#* *### +#* *### copy license file to lib/$artifactId.license +#* *##set ( $licFile = $directory + '/' + $project.artifact.artifactId + '.license' ) +#* *##if ( $spdx == "MIT" ) +#* *### MIT license contains date and copyright that makes the file specific to each artifact +#* *##set ( $downloaded = $locator.getResourceAsFile( "licenses/${spdx}-${project.artifact.artifactId}-${project.artifact.version}.txt", "licenses/${licFile}" ) ) +#* *##else +#* *##set ( $downloaded = $locator.getResourceAsFile( "licenses/${spdx}.txt", "licenses/${licFile}" ) ) +#* *##end +#* *### add dependency info to output -- lib/${project.artifact.artifactId}-${project.artifact.version}.jar: $project.artifact.toString().replace( ':eclipse-plugin:', ':jar:' ) +- $directory/${project.artifact.artifactId}-${project.artifact.version}.jar: $project.artifact.toString().replace( ':eclipse-plugin:', ':jar:' ) $project.name #if ( $project.url )Project URL: ${project.url}#end - License: $license.name#if ( $spdx ) ($spdx)#end#if ( $url ) $url ($licFile)#end + License: $license.name#if ( $spdx ) ($spdx)#end $license.url ($licFile) -#* *##end #* *##end #**##end #end diff --git a/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm new file mode 100644 index 00000000000..acf7ba42e07 --- /dev/null +++ b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm @@ -0,0 +1,116 @@ +## +## 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. +## +This software bundles the following NOTICE files from third party library providers: + +META-INF/NOTICE in archive lib/guice-4.2.1-no_aop.jar +Google Guice - Core Library +Copyright 2006-2018 Google, Inc. +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +META-INF/NOTICE in archive lib/plexus-utils-3.2.1.jar +This product includes software developed by the Indiana University + Extreme! Lab (http://www.extreme.indiana.edu/). +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). +This product includes software developed by +ThoughtWorks (http://www.thoughtworks.com). +This product includes software developed by +javolution (http://javolution.org/). +This product includes software developed by +Rome (https://rome.dev.java.net/). + +about.html in archive lib/org.eclipse.sisu.inject-0.3.4.jar + + + + + +About org.eclipse.sisu.inject + + +

About org.eclipse.sisu.inject

+ +

November 5, 2013

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ +

Third Party Content

+

The Content includes items that have been sourced from third parties as set +out below. If you did not receive this Content directly from the Eclipse Foundation, +the following is provided for informational purposes only, and you should look +to the Redistributor's license for terms and conditions of use.

+ +

ASM 4.1

+

The plug-in includes software developed by the ObjectWeb consortium as part +of the ASM project at http://asm.ow2.org/.

+ +

A subset of ASM is re-packaged within the source and binary of the plug-in (org.eclipse.sisu.space.asm.*) +to avoid version collisions with other usage and is also available from the plug-in's github repository.

+ +

Your use of the ASM code is subject to the terms and conditions of the ASM License +below which is also available at http://asm.ow2.org/license.html.

+ +
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form 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.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+ + + diff --git a/apache-maven/src/main/appended-resources/licenses/ASL-2.0.txt b/apache-maven/src/main/appended-resources/licenses/ASL-2.0.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/apache-maven/src/main/appended-resources/licenses/ASL-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) 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. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/apache-maven/src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt b/apache-maven/src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt new file mode 100644 index 00000000000..fa8a44e09e6 --- /dev/null +++ b/apache-maven/src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt @@ -0,0 +1,23 @@ +https://raw.githubusercontent.com/jhy/jsoup/jsoup-1.12.1/LICENSE + +The MIT License + +Copyright (c) 2009-2019 Jonathan Hedley + +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. diff --git a/apache-maven/src/main/appended-resources/licenses/MIT-slf4j-api-1.7.29.txt b/apache-maven/src/main/appended-resources/licenses/MIT-slf4j-api-1.7.29.txt new file mode 100644 index 00000000000..5a09409f363 --- /dev/null +++ b/apache-maven/src/main/appended-resources/licenses/MIT-slf4j-api-1.7.29.txt @@ -0,0 +1,23 @@ +https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.29/LICENSE.txt + +Copyright (c) 2004-2017 QOS.ch +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 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. diff --git a/apache-maven/src/main/appended-resources/licenses/MIT.txt b/apache-maven/src/main/appended-resources/licenses/MIT.txt deleted file mode 100644 index 0d951a465f9..00000000000 --- a/apache-maven/src/main/appended-resources/licenses/MIT.txt +++ /dev/null @@ -1,14 +0,0 @@ -The MIT License - -Copyright (c) - -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. diff --git a/apache-maven/src/main/assembly/component.xml b/apache-maven/src/main/assembly/component.xml index 56b3f0b65fe..fab2c55c5d5 100644 --- a/apache-maven/src/main/assembly/component.xml +++ b/apache-maven/src/main/assembly/component.xml @@ -55,6 +55,13 @@ under the License. ** + + target/licenses/boot + boot + + ** + + target/dependency/META-INF/native lib/jansi-native diff --git a/pom.xml b/pom.xml index cdc3cd63408..426ae3bbef2 100644 --- a/pom.xml +++ b/pom.xml @@ -60,12 +60,13 @@ under the License. 4.2.1 0.3.4 3.3.4 + 1.12.1 1.4 1.7 1.11 1.3 1.4.1 - 1.7.25 + 1.7.29 2.2.1 1.7.4 true @@ -335,6 +336,14 @@ under the License. + + + org.jsoup + jsoup + ${jsoupVersion} + org.apache.maven.resolver