.gitignore

@@ -1,11 +1 @@
-wagon-1.0-beta-6-src.tar.gz
+SOURCES/wagon-3.3.3-source-release.zip
-wagon-1.0-source-release.zip
-/wagon-2.4-source-release.zip
-/wagon-2.5-source-release.zip
-/wagon-2.6-source-release.zip
-/wagon-2.7-source-release.zip
-/wagon-2.8-source-release.zip
-/wagon-2.9-source-release.zip
-/wagon-2.10-source-release.zip
-/wagon-3.0.0-source-release.zip
-/wagon-3.1.0-source-release.zip

.maven-wagon.metadata

@@ -0,0 +1 @@
+30ff892e0895f3da0679de8224a20f39dafd53e5 SOURCES/wagon-3.3.3-source-release.zip

.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>maven-wagon</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

SPECS/maven-wagon.spec

@@ -1,10 +1,6 @@
-%bcond_without  scm
-%bcond_without  ssh
-
 Name:           maven-wagon
-Epoch:          0
+Version:        3.3.3
-Version:        3.1.0
+Release:        2%{?dist}
-Release:        1%{?dist}
 Summary:        Tools to manage artifacts and deployment
 License:        ASL 2.0
 URL:            http://maven.apache.org/wagon
@@ -13,30 +9,15 @@ BuildArch:      noarch
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip
 
 BuildRequires:  maven-local
-%if %{with ssh}
+BuildRequires:  %{?module_prefix}mvn(commons-io:commons-io)
-BuildRequires:  mvn(com.jcraft:jsch)
+BuildRequires:  %{?module_prefix}mvn(org.apache.httpcomponents:httpclient)
-BuildRequires:  mvn(com.jcraft:jsch.agentproxy.connector-factory)
+BuildRequires:  %{?module_prefix}mvn(org.apache.httpcomponents:httpcore)
-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:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  %{?module_prefix}mvn(org.jsoup:jsoup)
-BuildRequires:  mvn(org.jsoup:jsoup)
+BuildRequires:  %{?module_prefix}mvn(org.slf4j:jcl-over-slf4j)
-BuildRequires:  mvn(org.slf4j:jcl-over-slf4j)
+BuildRequires:  %{?module_prefix}mvn(org.slf4j:slf4j-api)
-BuildRequires:  mvn(org.slf4j:slf4j-api)
-
-Obsoletes:      %{name}-manual < %{epoch}:%{version}-%{release}
-Obsoletes:      %{name}-provider-test < %{epoch}:%{version}-%{release}
 
 %description
 Maven Wagon is a transport abstraction that is used in Maven's
@@ -49,83 +30,8 @@ following providers:
 * WebDAV
 * SCM (in progress)
 
-%package provider-api
+%{?module_package}
-Summary:        provider-api module for %{name}
+%{?javadoc_package}
-Obsoletes:      %{name} < 2.6-4
-Obsoletes:      %{name}-webdav-jackrabbit < 2.9-2
-
-%description provider-api
-provider-api module for %{name}.
-
-%package providers
-Summary:        providers module for %{name}
-
-%description providers
-providers module for %{name}
-
-%package file
-Summary:        file module for %{name}
-
-%description file
-file module for %{name}.
-
-%package ftp
-Summary:        ftp module for %{name}
-
-%description ftp
-ftp module for %{name}.
-
-%package http
-Summary:        http module for %{name}
-
-%description http
-http module for %{name}.
-
-%package http-shared
-Summary:        http-shared module for %{name}
-
-%description http-shared
-http-shared module for %{name}.
-
-%package http-lightweight
-Summary:        http-lightweight module for %{name}
-
-%description http-lightweight
-http-lightweight module for %{name}.
-
-%if %{with scm}
-%package scm
-Summary:        scm module for %{name}
-
-%description scm
-scm module for %{name}.
-%endif
-
-%if %{with ssh}
-%package ssh-external
-Summary:        ssh-external module for %{name}
-
-%description ssh-external
-ssh-external module for %{name}.
-
-%package ssh-common
-Summary:        ssh-common module for %{name}
-
-%description ssh-common
-ssh-common module for %{name}.
-
-%package ssh
-Summary:        ssh module for %{name}
-
-%description ssh
-ssh module for %{name}.
-%endif
-
-%package javadoc
-Summary:        Javadoc for %{name}
-
-%description javadoc
-Javadoc for %{name}.
 
 %prep
 %setup -q -n wagon-%{version}
@@ -136,61 +42,60 @@ Javadoc for %{name}.
 
 # disable tests, missing dependencies
 %pom_disable_module wagon-tcks
-%pom_disable_module wagon-ssh-common-test wagon-providers/pom.xml
+%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
-%pom_disable_module wagon-webdav-jackrabbit wagon-providers
+%pom_disable_module wagon-ftp wagon-providers
-
+%pom_disable_module wagon-http-lightweight wagon-providers
-%if %{without scm}
 %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
+%pom_disable_module wagon-webdav-jackrabbit wagon-providers
+
+%pom_remove_plugin :maven-shade-plugin wagon-providers/wagon-http
 
-%build
 %mvn_file ":wagon-{*}" %{name}/@1
-
 %mvn_package ":wagon"
 
+%build
 # tests are disabled because of missing dependencies
-%mvn_build -f -s
+%mvn_build -f
 
 # Maven requires Wagon HTTP with classifier "shaded"
 %mvn_alias :wagon-http :::shaded:
 
-
 %install
 %mvn_install
 
-%files -f .mfiles
+%files -n %{?module_prefix}%{name} -f .mfiles
-%doc LICENSE NOTICE DEPENDENCIES
+%license LICENSE NOTICE
-%files provider-api -f .mfiles-wagon-provider-api
+%doc DEPENDENCIES
-%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
-
-%files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE DEPENDENCIES
 
 %changelog
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.3-2
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Jul 10 2019 Marian Koncek <mkoncek@redhat.com> - 3.3.3-1
+- 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
+- Disable ftp and http-lightweight providers
+
+* 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
+- Update to upstream version 3.3.2
+- Fixes: RHBZ #1674068
+
+* Mon Oct  8 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:3.2.0-1
+- Update to upstream version 3.2.0
+
 * Wed Jun 27 2018 Michael Simacek <msimacek@redhat.com> - 0:3.1.0-1
 - Update to upstream version 3.1.0
 

sources

@@ -1 +0,0 @@
-SHA512 (wagon-3.1.0-source-release.zip) = 40b472e0de2518a8331e7f57867d9de8bf6a9f4d4c9e9b590d760c8b5a29682cfa63d634cd980a5ce4dbe15354fc8d5ec1e3d24aa7ced37a89422d9a6398374c