Compare commits

...

No commits in common. "c8-stream-201902" and "c8-stream-201801" have entirely different histories.

3 changed files with 141 additions and 46 deletions

2
.gitignore vendored
View File

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

View File

@ -1 +1 @@
30ff892e0895f3da0679de8224a20f39dafd53e5 SOURCES/wagon-3.3.3-source-release.zip
7151f615380936e853836fd20ad6941e145d0d8e SOURCES/wagon-3.1.0-source-release.zip

View File

@ -1,6 +1,10 @@
%bcond_without scm
%bcond_without ssh
Name: maven-wagon
Version: 3.3.3
Release: 2%{?dist}
Epoch: 0
Version: 3.1.0
Release: 1%{?dist}
Summary: Tools to manage artifacts and deployment
License: ASL 2.0
URL: http://maven.apache.org/wagon
@ -9,15 +13,30 @@ BuildArch: noarch
Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip
BuildRequires: maven-local
BuildRequires: %{?module_prefix}mvn(commons-io:commons-io)
BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpclient)
BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpcore)
%if %{with ssh}
BuildRequires: mvn(com.jcraft:jsch)
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: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: %{?module_prefix}mvn(org.jsoup:jsoup)
BuildRequires: %{?module_prefix}mvn(org.slf4j:jcl-over-slf4j)
BuildRequires: %{?module_prefix}mvn(org.slf4j:slf4j-api)
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)
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
@ -30,8 +49,83 @@ following providers:
* WebDAV
* SCM (in progress)
%{?module_package}
%{?javadoc_package}
%package provider-api
Summary: provider-api module for %{name}
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}
@ -42,60 +136,61 @@ following providers:
# disable tests, missing dependencies
%pom_disable_module wagon-tcks
%pom_disable_module wagon-ssh-common-test wagon-providers
%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-ftp wagon-providers
%pom_disable_module wagon-http-lightweight wagon-providers
%pom_disable_module wagon-webdav-jackrabbit 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
%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"
%endif
%build
%mvn_file ":wagon-{*}" %{name}/@1
%mvn_package ":wagon"
# tests are disabled because of missing dependencies
%mvn_build -f
%mvn_build -f -s
# Maven requires Wagon HTTP with classifier "shaded"
%mvn_alias :wagon-http :::shaded:
%install
%mvn_install
%files -n %{?module_prefix}%{name} -f .mfiles
%license LICENSE NOTICE
%doc DEPENDENCIES
%files -f .mfiles
%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
%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