diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec index f7fe9b0..7a133a5 100644 --- a/apache-commons-vfs.spec +++ b/apache-commons-vfs.spec @@ -1,35 +1,29 @@ Name: apache-commons-vfs Version: 2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Commons Virtual File System License: ASL 2.0 Url: http://commons.apache.org/vfs/ Source0: http://www.apache.org/dist/commons/vfs/source/commons-vfs-%{version}-src.tar.gz -BuildRequires: maven-local -BuildRequires: mvn(com.jcraft:jsch) -BuildRequires: mvn(commons-httpclient:commons-httpclient) -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-logging:commons-logging) -BuildRequires: mvn(commons-net:commons-net) -BuildRequires: mvn(javax.ws.rs:jsr311-api) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.ant:ant) -# hadoop:2.6.0 https://bugzilla.redhat.com/show_bug.cgi?id=1235420 -BuildRequires: mvn(org.apache.hadoop:hadoop-common) -BuildRequires: mvn(org.apache.hadoop:hadoop-hdfs) -BuildRequires: mvn(org.apache.hadoop:hadoop-common::tests:) -BuildRequires: mvn(org.apache.hadoop:hadoop-hdfs::tests:) -BuildRequires: mvn(org.apache.commons:commons-collections4) -BuildRequires: mvn(org.apache.commons:commons-compress) -BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.commons:commons-parent:pom:) -BuildRequires: mvn(org.apache.ftpserver:ftpserver-core) -BuildRequires: mvn(org.apache.httpcomponents:httpcore-nio) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -# BuildRequires: mvn(org.apache.sshd:sshd-core:0.8.0) -BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) -BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: maven-local +BuildRequires: mvn(com.jcraft:jsch) +BuildRequires: mvn(commons-httpclient:commons-httpclient) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(commons-net:commons-net) +BuildRequires: mvn(javax.ws.rs:jsr311-api) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.commons:commons-collections4) +BuildRequires: mvn(org.apache.commons:commons-compress) +BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.ftpserver:ftpserver-core) +BuildRequires: mvn(org.apache.httpcomponents:httpcore-nio) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) +BuildRequires: mvn(org.slf4j:slf4j-api) BuildArch: noarch Provides: %{name}2 = %{version}-%{release} @@ -146,6 +140,10 @@ rm core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTes rm core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java %pom_remove_dep -r :sshd-core +# hadoop has been retired +%pom_remove_dep -r org.apache.hadoop +rm -r core/src/{main,test}/java/org/apache/commons/vfs2/provider/hdfs + # not really needed %pom_remove_plugin :maven-checkstyle-plugin %pom_remove_plugin :findbugs-maven-plugin @@ -188,6 +186,9 @@ install -p -m 644 commons-vfs %{buildroot}%{_sysconfdir}/ant.d/commons-vfs %config %{_sysconfdir}/ant.d/commons-vfs %changelog +* Thu Jun 02 2016 Michael Simacek - 2.1-2 +- Remove support for retired hadoop + * Sun May 22 2016 gil cattaneo 2.1-1 - update to 2.1