diff --git a/.gitignore b/.gitignore index 967cf46..5a215cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /commons-vfs-2.0-src.tar.gz +/commons-vfs-2.1-src.tar.gz diff --git a/apache-commons-vfs-2.0-build.patch b/apache-commons-vfs-2.0-build.patch deleted file mode 100644 index 2d022ba..0000000 --- a/apache-commons-vfs-2.0-build.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff -Nru commons-vfs-2.0/core/pom.xml commons-vfs-2.0-gil/core/pom.xml ---- commons-vfs-2.0/core/pom.xml 2011-08-18 15:57:10.000000000 +0200 -+++ commons-vfs-2.0-gil/core/pom.xml 2012-06-18 11:47:33.151985239 +0200 -@@ -40,7 +40,7 @@ - commons-logging - - -- ant -+ org.apache.ant - ant - true - -@@ -64,11 +64,11 @@ - commons-httpclient - true - -- -+ - - com.jcraft - jsch -@@ -167,6 +167,37 @@ - - - -+ -+ org.apache.maven.plugins -+ maven-compiler-plugin -+ -+ -+ default-compile -+ compile -+ -+ -+ **/webdav/* -+ -+ -+ -+ compile -+ -+ -+ -+ default-testCompile -+ test-compile -+ -+ -+ **/webdav/test/* -+ -+ -+ -+ testCompile -+ -+ -+ -+ -+ - - - -diff -Nru commons-vfs-2.0/pom.xml commons-vfs-2.0-gil/pom.xml ---- commons-vfs-2.0/pom.xml 2011-08-18 15:57:11.000000000 +0200 -+++ commons-vfs-2.0-gil/pom.xml 2012-06-18 11:53:03.379995343 +0200 -@@ -187,14 +187,14 @@ - org.apache.maven.plugins - maven-checkstyle-plugin - -- -+ -+ < version inherited from commons-parent > - - commons-${commons.componentid}-${commons.release.version} - -- -+ - - - -@@ -243,9 +243,10 @@ - - - true -+ *.webdav.* - - -- -+ - - - -@@ -273,11 +274,11 @@ - test-jar - test - -- -+ - - org.apache.commons - commons-vfs-examples -@@ -310,13 +311,13 @@ - commons-compress - 1.1 - -- -+ - -- ant -+ org.apache.ant - ant - 1.6.2 - -@@ -349,7 +350,7 @@ - - - -- -+ - - - diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec index 7bba1e8..f7fe9b0 100644 --- a/apache-commons-vfs.spec +++ b/apache-commons-vfs.spec @@ -1,27 +1,35 @@ -%global base_name vfs -%global short_name commons-%{base_name} Name: apache-commons-vfs -Version: 2.0 -Release: 17%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: Commons Virtual File System License: ASL 2.0 -Url: http://commons.apache.org/%{base_name}/ -Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +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-collections:commons-collections) 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.jdom:jdom) - -# test deps -BuildRequires: mvn(junit:junit) +# BuildRequires: mvn(org.apache.sshd:sshd-core:0.8.0) +BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) +BuildRequires: mvn(org.slf4j:slf4j-api) BuildArch: noarch Provides: %{name}2 = %{version}-%{release} @@ -54,11 +62,16 @@ This package enables support for the Commons VFS ant tasks. %package examples Summary: Commons VFS Examples -Requires: %{name} = %{version}-%{release} %description examples VFS is a Virtual File System library - Examples. +%package project +Summary: Commons VFS Parent POM + +%description project +Commons VFS Parent POM. + %package javadoc Summary: Javadoc for %{name} @@ -66,29 +79,22 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -n %{short_name}-%{version} +%setup -q -n commons-vfs-%{version} perl -pi -e 's/\r$//g;' *.txt -# Remove unused dependencies -%pom_remove_dep :maven-scm-api -%pom_remove_dep :maven-scm-provider-svnexe -# Remove not available module -%pom_remove_dep :commons-vfs-sandbox # Disable unwanted module %pom_disable_module dist +# Fix ant gId +%pom_change_dep -r :ant org.apache.ant: +# Upadate bouncycastle aId +%pom_change_dep -r :bcprov-jdk16 :bcprov-jdk15on + +# Remove unwanted dependency jackrabbit-{standalone,webdav} +%pom_remove_dep -r org.apache.jackrabbit: # Fix plugin configuration %pom_xpath_inject "pom:project/pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" " *.webdav.*" -# Fix ant gId -%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" " -org.apache.ant" - -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" " -org.apache.ant" core - -# Remove unwanted dependency -%pom_remove_dep :jackrabbit-webdav core # Disable jackrabbit-webdav support %pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin core " @@ -123,28 +129,39 @@ rm -rf core/src/main/java/org/apache/commons/vfs2/provider/webdav rm -rf core/src/test/java/org/apache/commons/vfs2/provider/webdav sed -i 's|"webdav",||' core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java -rm -r core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java +rm core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java + +# UnknownHostException: www.apache.org +rm core/src/test/java/org/apache/commons/vfs2/provider/http/test/GetContentInfoFunctionalTest.java \ + core/src/test/java/org/apache/commons/vfs2/provider/https/test/GetContentInfoFunctionalTest.java +# org.apache.commons.vfs2.FileSystemException: Could not connect to FTP server on "localhost". +rm core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteAppendTests.java \ + core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java +sed -i /ProviderWriteAppendTests/d core/src/test/java/org/apache/commons/vfs2/test/ProviderTestSuite.java +sed -i /ProviderWriteTests/d core/src/test/java/org/apache/commons/vfs2/test/ProviderTestSuite.java +# java.lang.IllegalStateException: The embedded HTTP server has not completed startup, increase wait time +rm core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpProviderTestCase.java \ + core/src/test/java/org/apache/commons/vfs2/provider/url/test/UrlProviderHttpTestCase.java +# Use old version of sshd-core +rm core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java +%pom_remove_dep -r :sshd-core # not really needed %pom_remove_plugin :maven-checkstyle-plugin -%pom_remove_plugin :commons-build-plugin %pom_remove_plugin :findbugs-maven-plugin # Fix installation directory and symlink -%mvn_file :%{short_name}2 %{name} -%mvn_file :%{short_name}2 %{name}2 -%mvn_file :%{short_name}2 %{short_name} -%mvn_file :%{short_name}2 %{short_name}2 -%mvn_file :%{short_name}2-examples %{name}-examples -%mvn_file :%{short_name}2-examples %{name}2-examples -%mvn_file :%{short_name}2-examples %{short_name}-examples -%mvn_file :%{short_name}2-examples %{short_name}2-examples - -%mvn_alias :commons-vfs2 "org.apache.commons:%{short_name}" "%{short_name}:%{short_name}" -%mvn_alias :commons-vfs2-examples "org.apache.commons:%{short_name}-examples" "%{short_name}:%{short_name}-examples" - -# main package wins parent POM -%mvn_package ":commons-vfs2-project" commons-vfs2 +%mvn_file :commons-vfs2 %{name} +%mvn_file :commons-vfs2 %{name}2 +%mvn_file :commons-vfs2 commons-vfs +%mvn_file :commons-vfs2 commons-vfs2 +%mvn_file :commons-vfs2-examples %{name}-examples +%mvn_file :commons-vfs2-examples %{name}2-examples +%mvn_file :commons-vfs2-examples commons-vfs-examples +%mvn_file :commons-vfs2-examples commons-vfs2-examples + +%mvn_alias :commons-vfs2 "org.apache.commons:commons-vfs" "commons-vfs:commons-vfs" +%mvn_alias :commons-vfs2-examples "org.apache.commons:commons-vfs-examples" "commons-vfs:commons-vfs-examples" %build %mvn_build -s @@ -153,22 +170,27 @@ rm -r core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProv %mvn_install mkdir -p %{buildroot}%{_sysconfdir}/ant.d -echo "ant commons-logging %{short_name}" > %{short_name} -install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name} +echo "ant commons-logging commons-vfs" > commons-vfs +install -p -m 644 commons-vfs %{buildroot}%{_sysconfdir}/ant.d/commons-vfs %files -f .mfiles-commons-vfs2 %doc README.txt RELEASE-NOTES.txt %license LICENSE.txt NOTICE.txt %files examples -f .mfiles-commons-vfs2-examples +%files project -f .mfiles-commons-vfs2-project +%license LICENSE.txt NOTICE.txt %files javadoc -f .mfiles-javadoc %license LICENSE.txt NOTICE.txt %files ant -%config %{_sysconfdir}/ant.d/%{short_name} +%config %{_sysconfdir}/ant.d/commons-vfs %changelog +* Sun May 22 2016 gil cattaneo 2.1-1 +- update to 2.1 + * Wed Feb 03 2016 Fedora Release Engineering - 2.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 7423488..788dee7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce839bb9f345de1c5da819239b395898 commons-vfs-2.0-src.tar.gz +a182ac642874e85fbc7d1086f7663482 commons-vfs-2.1-src.tar.gz