commit 9548f8027af2330df7866d27fe350285dfcc6828d8076b2939d036719049d4b6 Author: Adrian Schröter Date: Fri May 3 16:43:17 2024 +0200 Sync from SUSE:SLFO:Main maven-wagon revision 3008efd913bb172a3714469f8da327ef diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/maven-wagon-build.tar.xz b/maven-wagon-build.tar.xz new file mode 100644 index 0000000..df9e912 --- /dev/null +++ b/maven-wagon-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18625826b1d181eb4b13552662d43815852e17d597d2e255501e3439d14eb2fb +size 4504 diff --git a/maven-wagon.changes b/maven-wagon.changes new file mode 100644 index 0000000..dfd7a12 --- /dev/null +++ b/maven-wagon.changes @@ -0,0 +1,118 @@ +------------------------------------------------------------------- +Wed May 3 11:20:51 UTC 2023 - Fridrich Strba + +- Upgrade to version 3.5.3 + * Bug + + [WAGON-627] Maven deploy fails with 401 Unauthorized when + using £ in password + + [WAGON-628] Default connect timeout not set when no + HttpMethodConfiguration is available + * Improvement + + [WAGON-629] Properly handle authentication scenarios with + MKCOL + * Task + + [WAGON-619] Remove shading of JSoup + + [WAGON-614] Deprecate Wagon FTP Provider + + [WAGON-615] Deprecate Wagon HTTP Lightweight Provider + + [WAGON-616] Deprecate Wagon SSH Provider + + [WAGON-617] Deprecate Wagon WebDAV Provider + + [WAGON-618] Remove HTTP file listing with JSoup + * Dependency upgrade + + [WAGON-620] Upgrade SLF4J to 1.7.32 + + [WAGON-621] Upgrade JUnit to 4.13.2 + + [WAGON-622] Upgrade Plexus Interactivity to 1.1 + + [WAGON-623] Upgrade HttpCore to 4.4.15 + + [WAGON-631] Upgrade and clean up dependencies + +------------------------------------------------------------------- +Wed Apr 28 12:00:04 UTC 2021 - Fridrich Strba + +- Upgrade to version 3.4.3 + * Fixes: + + [WAGON-537] Maven transfer speed of large artifacts is slow + due to unsuitable buffer strategy + + [WAGON-539] Explicitly register only supported auth schemes + + [WAGON-540] Switch to modern-day encoding (UTF-8) of auth + credentials + + [WAGON-544] Work around JSch issue #122 + + [WAGON-546] HttpWagon TTL not set + + [WAGON-547] Upgrade HttpCore to 4.4.11 + + [WAGON-548] Upgrade HttpClient to 4.5.7 + + [WAGON-549] Upgrade Commons Net to 3.6 + + [WAGON-550] Upgrade JSoup to 1.11.3 + + [WAGON-551] Uprade JSch to 0.1.55 + + [WAGON-552] Replace Commons Codec with Plexus Utils + + [WAGON-553] Upgrade Plexus Classworlds to 2.6.0 + + [WAGON-554] Tests with checkin rely on global Git config + + [WAGON-555] Use java.nio.file.Path for URI construction of + file:// URI in tests + + [WAGON-556] Skip parsing of user info for file:// URLs + + [WAGON-557] Integer overflow prevents optimal buffer size + selection for large artifacts + + [WAGON-559] Upgrade Plexus Interactivity to 1.0 + + [WAGON-560] Upgrade Plexus Utils to 3.2.0 + + [WAGON-561] Upgrade JSoup to 1.12.1 + + [WAGON-562] Upgrade HttpClient to 4.5.9 + + [WAGON-564] SSH connection failure because + 'preferredAuthentications' option is ignored if password + isn't set + + [WAGON-567] Provide request retry strategy on transient + client and server side errors + + [WAGON-568] Fail to deploy on Sonatype OSS since Maven 3.5.4 + + [WAGON-569] Inconsistent encoding behavior for repository + URLs with spaces + + [WAGON-570] Use RedirectStrategy from HttpClient rather than + a custom approach + + [WAGON-571] Rename RequestEntityImplementation to + WagonHttpEntity + + [WAGON-573] EntityUtils.consumeQuietly() never called on + non-2xx status codes + + [WAGON-576] Retry handler docs are possibly wrong + + [WAGON-577] Upgrade HttpCore to 4.4.13 + + [WAGON-578] Upgrade HttpClient to 4.5.11 + + [WAGON-579] Handle SC_UNAUTHORIZED and + SC_PROXY_AUTHENTICATION_REQUIRED in all methods + + [WAGON-580] Improve and unify exception messages by status + code types throughout HTTP providers + + [WAGON-581] Upgrade HttpClient to 4.5.12 + + [WAGON-582] HttpMethodConfiguration#copy() performs a shallow + copy only + + [WAGON-585] maven.wagon.http.ssl features documentation is + incomplete + + [WAGON-586] update parent POM + + [WAGON-588] Handle 404 and 410 consistently in HTTP-based + Wagon providers + + [WAGON-589] reminder to remove in the future + + [WAGON-591] Transfer event is not restarted when request is + redirected + + [WAGON-592] Wagon fails when compiled on Java 9+ and run on + Java 8 due to JDK API breakage + + [WAGON-593] Remove non-existent cache header + + [WAGON-594] http.route.default-proxy config property never + passes protocol and port of proxy server + + [WAGON-595] Add configuration property + 'http.protocol.handle-content-compression' + + [WAGON-596] Add configuration property + 'http.protocol.handle-uri-normalization' + + [WAGON-597] Fix self-assignment and set class field + + [WAGON-602] [Regression] Preserve trailing slash in encoded + URL + + [WAGON-607] Upgrade HttpCore to 4.4.14 + + [WAGON-608] Upgrade HttpClient to 4.5.13 + + [WAGON-609] Upgrade transitive Commons Codec to 1.15 + +------------------------------------------------------------------- +Mon Oct 7 09:39:56 UTC 2019 - Fridrich Strba + +- Build also the ssh* providers + +------------------------------------------------------------------- +Sat Oct 5 16:53:43 UTC 2019 - Fridrich Strba + +- Avoid unversioned dependencies + +------------------------------------------------------------------- +Fri Mar 15 11:16:53 UTC 2019 - Fridrich Strba + +- Initial packaging of maven-wagon 3.2.0 +- Generate and customize the ant build files diff --git a/maven-wagon.spec b/maven-wagon.spec new file mode 100644 index 0000000..20fb19b --- /dev/null +++ b/maven-wagon.spec @@ -0,0 +1,259 @@ +# +# spec file for package maven-wagon +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: maven-wagon +Version: 3.5.3 +Release: 0 +Summary: Tools to manage artifacts and deployment +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://maven.apache.org/wagon +Source0: https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip +Source1: %{name}-build.tar.xz +BuildRequires: ant +BuildRequires: apache-commons-io +BuildRequires: apache-commons-net +BuildRequires: fdupes +BuildRequires: httpcomponents-client +BuildRequires: httpcomponents-core +BuildRequires: javapackages-local +BuildRequires: jsch +BuildRequires: jsch-agent-proxy-connector-factory +BuildRequires: jsch-agent-proxy-jsch +BuildRequires: jsoup +BuildRequires: plexus-interactivity-api +BuildRequires: plexus-metadata-generator +BuildRequires: plexus-utils +BuildRequires: slf4j +BuildRequires: unzip +BuildArch: noarch + +%description +Maven Wagon is a transport abstraction that is used in Maven's +artifact and repository handling code. Currently wagon has the +following providers: +* File +* HTTP +* FTP +* SSH/SCP +* WebDAV +* SCM (in progress) + +%package provider-api +Summary: The provider-api module for %{name} +Group: Development/Libraries/Java +Requires: mvn(org.codehaus.plexus:plexus-utils) + +%description provider-api +The provider-api module for %{name}. + +%package file +Summary: The file module for %{name} +Group: Development/Libraries/Java +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.codehaus.plexus:plexus-utils) + +%description file +The file module for %{name}. + +%package ftp +Summary: The ftp module for %{name} +Group: Development/Libraries/Java +Requires: mvn(commons-io:commons-io) +Requires: mvn(commons-net:commons-net) +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.slf4j:slf4j-api) + +%description ftp +The ftp module for %{name}. + +%package http +Summary: The http module for %{name} +Group: Development/Libraries/Java +Requires: mvn(org.apache.httpcomponents:httpclient) +Requires: mvn(org.apache.httpcomponents:httpcore) +Requires: mvn(org.apache.maven.wagon:wagon-http-shared) = %{version} +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.codehaus.plexus:plexus-utils) +Requires: mvn(org.slf4j:jcl-over-slf4j) + +%description http +The http module for %{name}. + +%package http-shared +Summary: The http-shared module for %{name} +Group: Development/Libraries/Java +Requires: mvn(commons-io:commons-io) +Requires: mvn(org.apache.httpcomponents:httpclient) +Requires: mvn(org.apache.httpcomponents:httpcore) +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.jsoup:jsoup) +Requires: mvn(org.slf4j:slf4j-api) + +%description http-shared +The http-shared module for %{name}. + +%package http-lightweight +Summary: The http-lightweight module for %{name} +Group: Development/Libraries/Java +Requires: mvn(commons-io:commons-io) +Requires: mvn(org.apache.maven.wagon:wagon-http-shared) = %{version} +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.codehaus.plexus:plexus-utils) + +%description http-lightweight +The http-lightweight module for %{name}. + +%package ssh-common +Summary: The ssh-common module for %{name} +Group: Development/Libraries/Java +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.codehaus.plexus:plexus-interactivity-api) +Requires: mvn(org.codehaus.plexus:plexus-utils) + +%description ssh-common +The ssh-common module for %{name} + +%package ssh +Summary: The ssh module for %{name} +Group: Development/Libraries/Java +Requires: mvn(com.jcraft:jsch) +Requires: mvn(com.jcraft:jsch.agentproxy.connector-factory) +Requires: mvn(com.jcraft:jsch.agentproxy.jsch) +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.apache.maven.wagon:wagon-ssh-common) = %{version} +Requires: mvn(org.codehaus.plexus:plexus-interactivity-api) +Requires: mvn(org.codehaus.plexus:plexus-utils) + +%description ssh +The ssh module for %{name} + +%package ssh-external +Summary: The ssh-external module for %{name} +Group: Development/Libraries/Java +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.apache.maven.wagon:wagon-ssh-common) = %{version} +Requires: mvn(org.codehaus.plexus:plexus-utils) + +%description ssh-external +The ssh-external module for %{name} + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q -n wagon-%{version} -a1 + +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_dep :wagon-tck-http wagon-providers/wagon-http + +# disable tests, missing dependencies +%pom_disable_module wagon-tcks +%pom_disable_module wagon-ssh-common-test wagon-providers/pom.xml +%pom_disable_module wagon-provider-test +%pom_remove_dep :wagon-provider-test +%pom_remove_dep :wagon-provider-test wagon-providers + +# missing dependencies +%pom_disable_module wagon-webdav-jackrabbit wagon-providers + +%pom_disable_module wagon-scm wagon-providers + +for i in file ftp http http-shared http-lightweight ssh-common ssh ssh-external; do + %pom_remove_parent wagon-providers/wagon-${i} + %pom_xpath_inject "pom:project" " + org.apache.maven.wagon + %{version}" wagon-providers/wagon-${i} +done +%pom_remove_parent wagon-provider-api +%pom_xpath_inject "pom:project" " + org.apache.maven.wagon + %{version}" wagon-provider-api + +%pom_change_dep -r -f ::::: ::::: + +%build +mkdir -p lib +build-jar-repository -s lib \ + commons-io commons-net jsch \ + jsch.agentproxy.core jsch.agentproxy.jsch jsch.agentproxy.connector-factory \ + httpcomponents/httpclient httpcomponents/httpcore \ + jsoup/jsoup plexus/utils plexus/interactivity-api slf4j/api +# tests are disabled because of missing dependencies +%{ant} package javadoc + +%install +# jars +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 wagon-provider-api/target/wagon-provider-api-%{version}.jar %{buildroot}%{_javadir}/%{name}/provider-api.jar +for i in file ftp http http-shared http-lightweight ssh-common ssh ssh-external; do + install -pm 0644 wagon-providers/wagon-${i}/target/wagon-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar +done +# poms +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 0644 wagon-provider-api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/provider-api.pom +%add_maven_depmap %{name}/provider-api.pom %{name}/provider-api.jar -f provider-api +for i in file ftp http http-shared http-lightweight ssh-common ssh ssh-external; do + install -pm 0644 wagon-providers/wagon-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + if [ x${i} = xhttp ]; then + # Maven requires Wagon HTTP with classifier "shaded" + %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -a org.apache.maven.wagon:wagon-http::shaded: -f ${i} + else + %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i} + fi +done +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/provider-api +cp -pr wagon-provider-api/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/provider-api +for i in file ftp http http-shared http-lightweight ssh-common ssh ssh-external; do + install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i} + cp -pr wagon-providers/wagon-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/ +done +%fdupes -s %{buildroot}%{_javadocdir} + +%files provider-api -f .mfiles-provider-api +%license LICENSE NOTICE +%doc DEPENDENCIES + +%files file -f .mfiles-file + +%files ftp -f .mfiles-ftp + +%files http -f .mfiles-http + +%files http-shared -f .mfiles-http-shared + +%files http-lightweight -f .mfiles-http-lightweight + +%files ssh-common -f .mfiles-ssh-common + +%files ssh -f .mfiles-ssh + +%files ssh-external -f .mfiles-ssh-external + +%files javadoc +%license LICENSE NOTICE +%doc DEPENDENCIES +%{_javadocdir}/%{name} + +%changelog diff --git a/wagon-3.5.3-source-release.zip b/wagon-3.5.3-source-release.zip new file mode 100644 index 0000000..1ab23d0 --- /dev/null +++ b/wagon-3.5.3-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0368079783335eca4de866c78149dea24239e5419161e1edde0b4c2ca508509e +size 635273