.gitignore

@@ -1 +1 @@
-SOURCES/wagon-3.4.2-source-release.zip
+SOURCES/wagon-3.1.0-source-release.zip

.maven-wagon.metadata

@@ -1 +1 @@
-fa3513b24d76a55bf5f7a49e58fd05074acceb04 SOURCES/wagon-3.4.2-source-release.zip
+7151f615380936e853836fd20ad6941e145d0d8e SOURCES/wagon-3.1.0-source-release.zip

SPECS/maven-wagon.spec

@@ -1,43 +1,42 @@
-%bcond_with bootstrap
+%bcond_without  scm
+%bcond_without  ssh
 
 Name:           maven-wagon
-Version:        3.4.2
+Epoch:          0
-Release:        8%{?dist}
+Version:        3.1.0
+Release:        1%{?dist}
 Summary:        Tools to manage artifacts and deployment
 License:        ASL 2.0
-URL:            https://maven.apache.org/wagon
+URL:            http://maven.apache.org/wagon
 BuildArch:      noarch
 
-Source0:        https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip
+Source0:        http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip
 
-BuildRequires:  maven-local-openjdk8
+BuildRequires:  maven-local
-%if %{with bootstrap}
+%if %{with ssh}
-BuildRequires:  javapackages-bootstrap
+BuildRequires:  mvn(com.jcraft:jsch)
-%else
+BuildRequires:  mvn(com.jcraft:jsch.agentproxy.connector-factory)
+BuildRequires:  mvn(com.jcraft:jsch.agentproxy.jsch)
+%endif
 BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(commons-net:commons-net)
 BuildRequires:  mvn(org.apache.httpcomponents:httpclient)
 BuildRequires:  mvn(org.apache.httpcomponents:httpcore)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
+%if %{with scm}
+BuildRequires:  mvn(org.apache.maven.scm:maven-scm-api)
+BuildRequires:  mvn(org.apache.maven.scm:maven-scm-manager-plexus)
+%endif
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-interactivity-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.jsoup:jsoup)
 BuildRequires:  mvn(org.slf4j:jcl-over-slf4j)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
-%endif
 
-Provides:       maven-wagon-file = %{version}-%{release}
+Obsoletes:      %{name}-manual < %{epoch}:%{version}-%{release}
-Provides:       maven-wagon-http = %{version}-%{release}
+Obsoletes:      %{name}-provider-test < %{epoch}:%{version}-%{release}
-Provides:       maven-wagon-http-shared = %{version}-%{release}
-Provides:       maven-wagon-provider-api = %{version}-%{release}
-Provides:       maven-wagon-providers = %{version}-%{release}
-
-Obsoletes:      maven-wagon-file < 3.4.2-2
-Obsoletes:      maven-wagon-http < 3.4.2-2
-Obsoletes:      maven-wagon-http-shared < 3.4.2-2
-Obsoletes:      maven-wagon-provider-api < 3.4.2-2
-Obsoletes:      maven-wagon-providers < 3.4.2-2
-Obsoletes:      maven-wagon-ftp < 3.4.2-2
-Obsoletes:      maven-wagon-http-lightweight < 3.4.2-2
 
 %description
 Maven Wagon is a transport abstraction that is used in Maven's
@@ -50,144 +49,150 @@ following providers:
 * WebDAV
 * SCM (in progress)
 
-%{?javadoc_package}
+%package provider-api
+Summary:        provider-api module for %{name}
+Obsoletes:      %{name} < 2.6-4
+Obsoletes:      %{name}-webdav-jackrabbit < 2.9-2
 
-%prep
+%description provider-api
-%setup -q -n wagon-%{version}
+provider-api module for %{name}.
 
-%pom_remove_plugin :animal-sniffer-maven-plugin
+%package providers
-%pom_remove_plugin :maven-enforcer-plugin
+Summary:        providers module for %{name}
-%pom_remove_dep :wagon-tck-http wagon-providers/wagon-http
 
-# disable tests, missing dependencies
+%description providers
-%pom_disable_module wagon-tcks
+providers module for %{name}
-%pom_disable_module wagon-ssh-common-test wagon-providers
-%pom_disable_module wagon-provider-test
-%pom_remove_dep :wagon-provider-test
-%pom_remove_dep :wagon-provider-test wagon-providers
 
-# missing dependencies
+%package file
-%pom_disable_module wagon-ftp wagon-providers
+Summary:        file module for %{name}
-%pom_disable_module wagon-http-lightweight wagon-providers
-%pom_disable_module wagon-scm wagon-providers
-%pom_disable_module wagon-ssh wagon-providers
-%pom_disable_module wagon-ssh-common wagon-providers
-%pom_disable_module wagon-ssh-external wagon-providers
-%pom_disable_module wagon-webdav-jackrabbit wagon-providers
-
-%pom_remove_plugin :maven-shade-plugin wagon-providers/wagon-http
-
-%mvn_file ":wagon-{*}" %{name}/@1
-%mvn_package ":wagon"
-
-%build
-# tests are disabled because of missing dependencies
-%mvn_build -f
 
-# Maven requires Wagon HTTP with classifier "shaded"
+%description file
-%mvn_alias :wagon-http :::shaded:
+file module for %{name}.
 
-%install
+%package ftp
-%mvn_install
+Summary:        ftp module for %{name}
 
-%files -f .mfiles
+%description ftp
-%license LICENSE NOTICE
+ftp module for %{name}.
-%doc DEPENDENCIES
 
-%changelog
+%package http
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 3.4.2-8
+Summary:        http module for %{name}
-- Rebuild with regenerated Requires on Java
 
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.2-7
+%description http
-- Rebuild to regenerate auto-requires
+http module for %{name}.
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.4.2-6
+%package http-shared
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+Summary:        http-shared module for %{name}
-  Related: rhbz#1991688
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.2-5
+%description http-shared
-- Rebuild to workaround DistroBaker issue
+http-shared module for %{name}.
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.2-4
+%package http-lightweight
-- Bootstrap Maven for CentOS Stream 9
+Summary:        http-lightweight module for %{name}
 
-* Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.2-3
+%description http-lightweight
-- Obsolete removed subpackages
+http-lightweight module for %{name}.
 
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.2-2
+%if %{with scm}
-- Bootstrap build
+%package scm
-- Non-bootstrap build
+Summary:        scm module for %{name}
 
-* Tue Feb 02 2021 Fabio Valentini <decathorpe@gmail.com> - 0:3.4.2-1
+%description scm
-- Update to version 3.4.2.
+scm module for %{name}.
+%endif
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.4.1-4
+%if %{with ssh}
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+%package ssh-external
+Summary:        ssh-external module for %{name}
 
-* Fri Dec  4 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.2-1
+%description ssh-external
-- Update to upstream version 3.4.2
+ssh-external module for %{name}.
 
-* Fri Sep 11 2020 Marian Koncek <mkoncek@redhat.com> - 3.4.1-1
+%package ssh-common
-- Update to upstream version 3.4.1
+Summary:        ssh-common module for %{name}
 
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.4.1-3
+%description ssh-common
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+ssh-common module for %{name}.
 
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:3.4.1-2
+%package ssh
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+Summary:        ssh module for %{name}
 
-* Mon Jun 08 2020 Fabio Valentini <decathorpe@gmail.com> - 0:3.4.1-1
+%description ssh
-- Update to version 3.4.1.
+ssh module for %{name}.
+%endif
 
-* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 0:3.4.0-1
+%package javadoc
-- Update to version 3.4.0.
+Summary:        Javadoc for %{name}
 
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.3.3-5
+%description javadoc
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+Javadoc for %{name}.
 
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.4-2
+%prep
-- Build with OpenJDK 8
+%setup -q -n wagon-%{version}
 
-* Thu Nov 21 2019 Marian Koncek <mkoncek@redhat.com> - 3.3.4-1
+%pom_remove_plugin :animal-sniffer-maven-plugin
-- Update to upstream version 3.3.4
+%pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_dep :wagon-tck-http wagon-providers/wagon-http
 
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.3-2
+# disable tests, missing dependencies
-- Mass rebuild for javapackages-tools 201902
+%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
 
-* Sat Sep 14 2019 Miro Hrončok <mhroncok@redhat.com> - 0:3.3.3-4
+# missing dependencies
-- Obsolete maven-wagon-ssh properly (#1752165)
+%pom_disable_module wagon-webdav-jackrabbit wagon-providers
 
-* Thu Aug 29 2019 Fabio Valentini <decathorpe@gmail.com> - 0:3.3.3-3
+%if %{without scm}
-- Disable SSH functionality.
+%pom_disable_module wagon-scm wagon-providers
+%endif
+%if %{without ssh}
+%pom_disable_module wagon-ssh wagon-providers
+%pom_disable_module wagon-ssh-common wagon-providers
+%pom_disable_module wagon-ssh-external wagon-providers
+%endif
 
-* Fri Jul 12 2019 Fabio Valentini <decathorpe@gmail.com> - 0:3.3.3-2
+%build
-- Disable SCM leaf subpackage to fix FTBFS on 32bit architectures.
+%mvn_file ":wagon-{*}" %{name}/@1
 
-* Wed Jul 10 2019 Marian Koncek <mkoncek@redhat.com> - 3.3.3-1
+%mvn_package ":wagon"
-- Update to upstream version 3.3.3
-- Remove dependency on maven-shade-plugin
 
-* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.2-3
+# tests are disabled because of missing dependencies
-- Disable ftp and http-lightweight providers
+%mvn_build -f -s
 
-* Thu Jun 27 2019 Fabio Valentini <decathorpe@gmail.com> - 0:3.3.3-1
+# Maven requires Wagon HTTP with classifier "shaded"
-- Update to version 3.3.3.
+%mvn_alias :wagon-http :::shaded:
 
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.2-2
-- Mass rebuild for javapackages-tools 201901
 
-* Wed Feb 27 2019 Marian Koncek <mkoncek@redhat.com> - 0:3.3.2-1
+%install
-- Update to upstream version 3.3.2
+%mvn_install
-- Fixes: RHBZ #1674068
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.2.0-2
+%files -f .mfiles
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+%doc LICENSE NOTICE DEPENDENCIES
+%files provider-api -f .mfiles-wagon-provider-api
+%dir %{_javadir}/%{name}
+%files providers -f .mfiles-wagon-providers
+%files file -f .mfiles-wagon-file
+%files ftp -f .mfiles-wagon-ftp
+%files http -f .mfiles-wagon-http
+%files http-shared -f .mfiles-wagon-http-shared
+%files http-lightweight -f .mfiles-wagon-http-lightweight
+%if %{with scm}
+%files scm -f .mfiles-wagon-scm
+%endif
+%if %{with ssh}
+%files ssh-external -f .mfiles-wagon-ssh-external
+%files ssh-common -f .mfiles-wagon-ssh-common
+%files ssh -f .mfiles-wagon-ssh
+%endif
 
-* Mon Oct  8 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:3.2.0-1
+%files javadoc -f .mfiles-javadoc
-- Update to upstream version 3.2.0
+%doc LICENSE NOTICE DEPENDENCIES
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.1.0-2
+%changelog
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Tue Dec 12 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0:3.1.0-1
+- Rebuilt for MSVSphere 8.8
 
 * Wed Jun 27 2018 Michael Simacek <msimacek@redhat.com> - 0:3.1.0-1
 - Update to upstream version 3.1.0