This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-7370 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7e8e8a467b59d10af282cc3a1f1861d29a8959bc Author: Michael Osipov <[email protected]> AuthorDate: Sun Dec 26 19:55:01 2021 +0100 [MNG-7370] Upgrade Maven Wagon to 3.5.1 This closes #644 --- apache-maven/pom.xml | 8 -------- apache-maven/src/assembly/component.xml | 1 - .../licenses/MIT-jsoup-1.12.1.txt | 23 ---------------------- pom.xml | 12 +---------- 4 files changed, 1 insertion(+), 43 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 57f2718..5fc5528 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -79,14 +79,6 @@ under the License. </exclusion> </exclusions> </dependency> - <!-- This is included in Wagon HTTP. - We are just making the dependency explicit - in order to ease license attribution --> - <dependency> - <groupId>org.jsoup</groupId> - <artifactId>jsoup</artifactId> - <scope>runtime</scope> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> diff --git a/apache-maven/src/assembly/component.xml b/apache-maven/src/assembly/component.xml index a82a7d3..6d9809c 100644 --- a/apache-maven/src/assembly/component.xml +++ b/apache-maven/src/assembly/component.xml @@ -31,7 +31,6 @@ under the License. <outputDirectory>lib</outputDirectory> <excludes> <exclude>org.codehaus.plexus:plexus-classworlds</exclude> - <exclude>org.jsoup:jsoup</exclude> </excludes> </dependencySet> </dependencySets> 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 deleted file mode 100644 index fa8a44e..0000000 --- a/apache-maven/src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt +++ /dev/null @@ -1,23 +0,0 @@ -https://raw.githubusercontent.com/jhy/jsoup/jsoup-1.12.1/LICENSE - -The MIT License - -Copyright (c) 2009-2019 Jonathan Hedley <[email protected]> - -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/pom.xml b/pom.xml index ed238b1..5d8b410 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,7 @@ under the License. <guavaVersion>30.1-jre</guavaVersion> <guavafailureaccessVersion>1.0.1</guavafailureaccessVersion> <sisuVersion>0.3.5</sisuVersion> - <wagonVersion>3.4.3</wagonVersion> - <jsoupVersion>1.12.1</jsoupVersion> + <wagonVersion>3.5.1</wagonVersion> <securityDispatcherVersion>2.0</securityDispatcherVersion> <cipherVersion>2.0</cipherVersion> <modelloVersion>1.11</modelloVersion> @@ -343,14 +342,6 @@ under the License. <version>${wagonVersion}</version> <classifier>shaded</classifier> </dependency> - <dependency> - <!-- this is included in Wagon Http - we are just making the dependency explicit - in order to ease license attribution --> - <groupId>org.jsoup</groupId> - <artifactId>jsoup</artifactId> - <version>${jsoupVersion}</version> - </dependency> <!-- Repository --> <dependency> <groupId>org.apache.maven.resolver</groupId> @@ -586,7 +577,6 @@ under the License. ! Excluded the license files itself cause they do not have have a license of themselves. --> <exclude>src/main/appended-resources/licenses/MIT-slf4j-api-1.7.30.txt</exclude> - <exclude>src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt</exclude> <exclude>src/main/appended-resources/licenses/EPL-1.0.txt</exclude> <exclude>src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt</exclude> </excludes>
