diff --git a/.project b/.project new file mode 100644 index 0000000..654d12c --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + maven-wagon + + + + + + + + diff --git a/maven-wagon-AbstractSshWagon.patch b/maven-wagon-AbstractSshWagon.patch deleted file mode 100644 index bd120e7..0000000 --- a/maven-wagon-AbstractSshWagon.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java.sav 2006-04-05 15:01:16.000000000 +0200 -+++ wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java 2006-04-05 15:10:41.000000000 +0200 -@@ -173,7 +173,7 @@ - - try - { -- proxy.connect( session, host, port ); -+ proxy.connect( null, host, port, 15 ); - } - catch ( Exception e ) - { diff --git a/maven-wagon-jsch.patch b/maven-wagon-jsch.patch deleted file mode 100644 index 9015c07..0000000 --- a/maven-wagon-jsch.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ./wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/SingleKnownHostProvider.java.sav 2005-10-12 10:16:36.000000000 -0400 -+++ ./wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/SingleKnownHostProvider.java 2008-10-03 17:10:56.000000000 -0400 -@@ -17,6 +17,7 @@ - */ - - import com.jcraft.jsch.HostKeyRepository; -+import com.jcraft.jsch.HostKey; - import com.jcraft.jsch.JSch; - import com.jcraft.jsch.UserInfo; - import org.codehaus.plexus.util.Base64; -@@ -59,6 +60,15 @@ - public void addKnownHosts( JSch sch, UserInfo userInfo ) - { - HostKeyRepository hkr = sch.getHostKeyRepository(); -- hkr.add( host, Base64.decodeBase64( key.getBytes() ), userInfo ); -+ //hkr.add( host, Base64.decodeBase64( key.getBytes() ), userInfo ); -+ try -+ { -+ HostKey hostkey = new HostKey(host, Base64.decodeBase64(key.getBytes())); -+ hkr.add(hostkey, userInfo); -+ } -+ catch (Exception e) -+ { -+ e.printStackTrace(); -+ } - } - } diff --git a/maven-wagon.spec b/maven-wagon.spec index ef079fb..26f37d4 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -28,26 +28,16 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# If you don't want to build with maven, and use straight ant instead, -# give rpmbuild option '--without maven' - -%define with_maven 1 -%define without_maven 0 - -%define bname wagon -%define blevel beta-6 - -%define bname wagon +%global bname wagon +%global blevel beta-6 # FIXME1: wagon-scm has been disabled for now due to maven-scm dependency # FIXME2: haltOnFailure/Error has been set to false for # wagon-http/wagon-ssh-external tests due to failures. -# FIXME3: Change spec file to build with maven2 -# FIXME4: Add javadoc options ant build Name: maven-%{bname} Version: 1.0 -Release: 0.2.b6.2%{?dist} +Release: 0.2.b6.3%{?dist} Epoch: 0 Summary: Tools to manage artifacts and deployment License: ASL 2.0 @@ -55,39 +45,11 @@ Group: Development/Java URL: http://maven.apache.org/wagon Source0: wagon-1.0-%{blevel}-src.tar.gz # svn export http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-beta-6/ -# tar czvf wagon-1.0-beta-2-src.tar.gz wagon-1.0-beta-2 +# tar czvf wagon-1.0-beta-6-src.tar.gz wagon-1.0-beta-6 Source1: wagon-1.0-jpp-depmap.xml -Source2: wagon-1.0-site.xml -# The following sources (3-15) were generated by running the maven2 ant task -# inside the root directory of Source0: "mvn ant:ant" -%if %{without_maven} -Source3: wagon-1.0-file-provider-build.xml -Source4: wagon-1.0-ftp-provider-build.xml -Source5: wagon-1.0-http-lightweight-provider-build.xml -Source6: wagon-1.0-http-provider-build.xml -Source7: wagon-1.0-http-shared-provider-build.xml -Source8: wagon-1.0-provider-api-build.xml -Source9: wagon-1.0-provider-test-build.xml -Source10: wagon-1.0-ssh-common-provider-build.xml -Source11: wagon-1.0-ssh-common-test-provider-build.xml -Source12: wagon-1.0-ssh-external-provider-build.xml -Source13: wagon-1.0-ssh-ganymed-provider-build.xml -Source14: wagon-1.0-ssh-provider-build.xml -Source15: wagon-1.0-webdav-provider-build.xml -%endif - -Patch0: wagon-1.0-wagon-http-lightweight-pom_xml.patch -Patch1: wagon-1.0-wagon-http-pom_xml.patch -Patch2: wagon-1.0-wagon-webdav-pom_xml.patch -Patch3: wagon-1.0-WebDavWagon.patch -Patch4: wagon-1.0-ServletServer.patch -Patch5: wagon-1.0-pom_xml.patch -Patch6: wagon-1.0-wagon-ftp-pom_xml.patch -Patch7: wagon-1.0-disable-webdav.patch - #patch for 1.0 beta-6 -Patch8: wagon-http-shared-pom_xml.patch +Patch0: wagon-http-shared-pom_xml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -95,31 +57,30 @@ BuildArch: noarch BuildRequires: jpackage-utils >= 0:1.7.2 BuildRequires: ant >= 0:1.6 BuildRequires: junit -%if %{with_maven} BuildRequires: maven2 >= 0:2.0.8 -BuildRequires: maven2-plugin-compiler -BuildRequires: maven2-plugin-install -BuildRequires: maven2-plugin-jar -BuildRequires: maven2-plugin-javadoc -BuildRequires: maven2-plugin-project-info-reports -BuildRequires: maven2-plugin-resources -BuildRequires: maven2-plugin-site -BuildRequires: maven2-plugin-surefire = 2.3 -BuildRequires: maven-surefire-provider-junit = 2.3 -BuildRequires: maven2-plugin-enforcer +BuildRequires: maven-compiler-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-project-info-reports-plugin +BuildRequires: maven-resources-plugin +BuildRequires: maven-site-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit +BuildRequires: maven-enforcer-plugin #BuildRequires: maven2-default-skin BuildRequires: plexus-maven-plugin -%endif +BuildRequires: maven-scm-test BuildRequires: xerces-j2 BuildRequires: classworlds BuildRequires: nekohtml BuildRequires: concurrent BuildRequires: ganymed-ssh2 -BuildRequires: jakarta-commons-codec +BuildRequires: apache-commons-codec BuildRequires: jakarta-commons-collections -BuildRequires: jakarta-commons-net +BuildRequires: apache-commons-net BuildRequires: jakarta-commons-httpclient -BuildRequires: jakarta-commons-logging +BuildRequires: apache-commons-logging #BuildRequires: jakarta-slide-webdavclient BuildRequires: jsch BuildRequires: jtidy @@ -133,7 +94,7 @@ BuildRequires: easymock Requires: ganymed-ssh2 Requires: jakarta-commons-httpclient -Requires: jakarta-commons-net +Requires: apache-commons-net #Requires: jakarta-slide-webdavclient Requires: jsch Requires: jtidy @@ -156,20 +117,16 @@ following providers: %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm %description javadoc Javadoc for %{name}. -%if %{with_maven} %package manual Summary: Documents for %{name} Group: Development/Documentation %description manual Documents for %{name}. -%endif %prep %setup -q -n %{bname}-%{version}-%{blevel} @@ -177,55 +134,7 @@ Documents for %{name}. #FIXME: have to drop wagon-webdav-jackrabbit until jackrabbit is available sed -i "s|wagon-webdav-jackrabbit||" wagon-providers/pom.xml -%if %{without_maven} -cp %{SOURCE3} wagon-providers/wagon-file/build.xml -cp %{SOURCE4} wagon-providers/wagon-ftp/build.xml -cp %{SOURCE5} wagon-providers/wagon-http-lightweight/build.xml -cp %{SOURCE6} wagon-providers/wagon-http/build.xml -cp %{SOURCE7} wagon-providers/wagon-http-shared/build.xml -cp %{SOURCE8} wagon-provider-api/build.xml -cp %{SOURCE9} wagon-provider-test/build.xml -cp %{SOURCE10} wagon-providers/wagon-ssh-common/build.xml -cp %{SOURCE11} wagon-providers/wagon-ssh-common-test/build.xml -cp %{SOURCE12} wagon-providers/wagon-ssh-external/build.xml -cp %{SOURCE13} wagon-providers/wagon-ssh-ganymed/build.xml -cp %{SOURCE14} wagon-providers/wagon-ssh/build.xml -cp %{SOURCE15} wagon-providers/wagon-webdav/build.xml - -# FIXME: the following should not be necessary with a newer site-plugin -mkdir -p src/site -cp %{SOURCE2} src/site/site.xml -cp %{SOURCE2} wagon-provider-api/src/site/site.xml -cp %{SOURCE2} wagon-providers/wagon-file/src/site/site.xml -cp %{SOURCE2} wagon-providers/wagon-ftp/src/site/site.xml -mkdir -p wagon-providers/wagon-http-shared/src/site -cp %{SOURCE2} wagon-providers/wagon-http-shared/src/site/site.xml -cp %{SOURCE2} wagon-providers/wagon-http-lightweight/src/site/site.xml -cp %{SOURCE2} wagon-providers/wagon-http/src/site/site.xml -mkdir -p wagon-providers/wagon-ssh-common/src/site -cp %{SOURCE2} wagon-providers/wagon-ssh-common/src/site/site.xml -mkdir -p wagon-providers/wagon-ssh-common-test/src/site -cp %{SOURCE2} wagon-providers/wagon-ssh-common-test/src/site/site.xml -mkdir -p wagon-providers/wagon-ssh-ganymed/src/site -cp %{SOURCE2} wagon-providers/wagon-ssh-ganymed/src/site/site.xml -cp %{SOURCE2} wagon-providers/wagon-ssh-external/src/site/site.xml -cp %{SOURCE2} wagon-providers/wagon-ssh/src/site/site.xml -cp %{SOURCE2} wagon-providers/wagon-webdav/src/site/site.xml -cp %{SOURCE2} wagon-provider-test/src/site/site.xml -cp %{SOURCE2} wagon-site/src/site/site.xml -%endif - -%if 0 %patch0 -b .sav -%patch1 -b .sav -%patch2 -b .sav -%patch3 -b .sav -%patch4 -b .sav -%patch5 -b .sav -%patch6 -b .sav -%patch7 -b .sav -%endif -%patch8 -b .sav # To wire out jetty, plexus-avalon-personality and plexus-ftpd requirement rm -f wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java @@ -236,12 +145,7 @@ rm -f wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/ #rm -f wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java rm -f wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java -# skip site generation due to the failure of maven site -rm -rf src/site/site.xml - %build -%if %{with_maven} - export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mkdir -p $MAVEN_REPO_LOCAL @@ -251,122 +155,7 @@ mvn-jpp \ -Dmaven2.jpp.depmap.file=%{SOURCE1} \ -Dmaven.test.failure.ignore=true \ -Dmaven.test.skip=true \ - install javadoc:javadoc - -%else - -pushd wagon-provider-api -export CLASSPATH=$(build-classpath plexus/utils) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-provider-test -export CLASSPATH=../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath plexus/container-default plexus/utils junit) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-providers/wagon-file -export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath classworlds plexus/container-default plexus/utils) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-providers/wagon-ftp -export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath classworlds concurrent commons-collections commons-net \ -plexus/container-default \ -plexus/utils) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-providers/wagon-http-lightweight -export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../wagon-http-shared/target/wagon-http-shared-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath classworlds plexus/container-default plexus/utils commons-logging servletapi5) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-providers/wagon-http-shared -export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath jtidy plexus/utils) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-providers/wagon-http -export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../wagon-http-shared/target/wagon-http-shared-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath classworlds plexus/container-default plexus/utils commons-codec commons-httpclient commons-logging servletapi5) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-providers/wagon-ssh-common -export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath plexus/interactivity-api plexus/utils) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-providers/wagon-ssh-common-test -export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath junit plexus/container-default plexus/utils) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-providers/wagon-ssh-external -export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath classworlds plexus/container-default plexus/utils) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-providers/wagon-ssh-ganymed -export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath classworlds ganymed-ssh2 plexus/container-default plexus/interactivity-api plexus/utils) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -pushd wagon-providers/wagon-ssh -export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:../wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}-%{blevel}.jar -CLASSPATH=$CLASSPATH:$(build-classpath classworlds jsch plexus/container-default plexus/interactivity-api plexus/utils) -CLASSPATH=$CLASSPATH:target/classes:target/test-classes -ant -Dbuild.sysclasspath=only jar javadoc -popd - -## FIXME: webdav disabled until jakarta-slide-webdav and it-could-webdav are in Fedora - -#pushd wagon-providers/wagon-webdav -#export CLASSPATH=../../wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar -#CLASSPATH=$CLASSPATH:../../wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar -#CLASSPATH=$CLASSPATH:$(build-classpath classworlds commons-codec commons-httpclient commons-logging it-could-webdav jetty5/jetty5 plexus/container-default plexus/utils slide/slide-webdavclient-webdavlib servletapi5) -#CLASSPATH=$CLASSPATH:target/classes:target/test-classes -#ant -Dbuild.sysclasspath=only jar javadoc -#popd -%endif + install javadoc:aggregate %install rm -rf $RPM_BUILD_ROOT @@ -497,52 +286,7 @@ install -m 644 wagon-providers/wagon-ssh/pom.xml \ # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-api - -ls -lR wagon-provider-api/target/ - -cp -pr wagon-provider-api/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-api - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/file -cp -pr wagon-providers/wagon-file/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/file - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ftp -cp -pr wagon-providers/wagon-ftp/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ftp - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-lightweight -cp -pr wagon-providers/wagon-http-lightweight/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-lightweight - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-shared -cp -pr wagon-providers/wagon-http-shared/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-shared - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http -cp -pr wagon-providers/wagon-http/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/scm -cp -pr wagon-providers/wagon-scm/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/scm - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-common -cp -pr wagon-providers/wagon-ssh-common/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-common - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-common-test -cp -pr wagon-providers/wagon-ssh-common-test/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-common-test - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-external -cp -pr wagon-providers/wagon-ssh-external/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-external - -#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-ganymed -#cp -pr wagon-providers/wagon-ssh-ganymed/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-ganymed - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh -cp -pr wagon-providers/wagon-ssh/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh - -##install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/webdav -##cp -pr wagon-providers/wagon-webdav/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh - -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test -cp -pr wagon-provider-test/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test - +cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # manual @@ -568,7 +312,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_javadir}/* -#%doc %{_docdir}/%{name}-%{version}/LICENSE.txt %{_datadir}/maven2/poms/*.pom %{_mavendepmapfragdir} @@ -577,13 +320,16 @@ rm -rf $RPM_BUILD_ROOT %doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} -%if %{with_maven} %files manual %defattr(-,root,root,-) %doc %{_docdir}/%{name}-%{version} -%endif %changelog +* Thu Sep 9 2010 Alexander Kurtakov 0:1.0-0.2.b6.3 +- Use javadoc:aggregate. +- Drop ant build. +- Use global instead of define. + * Fri May 14 2010 Yong Yang 0:1.0-0.2.b6.2 - Create patch for wagon-http-shared pom.xml diff --git a/wagon-1.0-FtpWagon.patch b/wagon-1.0-FtpWagon.patch deleted file mode 100644 index 5ec6304..0000000 --- a/wagon-1.0-FtpWagon.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java.sav 2005-11-02 17:41:03.000000000 +0100 -+++ wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java 2005-11-02 17:42:02.000000000 +0100 -@@ -326,7 +326,7 @@ - String filename = PathUtils.filename( resource.getName() ); - FTPFile[] ftpFiles = ftp.listFiles( filename ); - -- if ( ftpFiles == null ) -+ if ( ftpFiles == null || ftpFiles.length == 0 ) - { - throw new ResourceDoesNotExistException( "Could not find file: '" + resource + "'" ); - } diff --git a/wagon-1.0-ScmWagon.patch b/wagon-1.0-ScmWagon.patch deleted file mode 100644 index 44cfab9..0000000 --- a/wagon-1.0-ScmWagon.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java.sav 2005-11-04 09:57:43.000000000 +0100 -+++ wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java 2005-11-04 10:27:07.000000000 +0100 -@@ -153,16 +153,16 @@ - // TODO: ewwww - if ( new File( basedir, ".svn" ).exists() || new File( basedir, "CVS" ).exists() ) - { -- scmManager.update( scmRepository, new ScmFileSet( basedir ), null ); -+ scmManager.getProviderByRepository( scmRepository ).update( scmRepository, new ScmFileSet( basedir ), null ); - } - else - { - File lastOne = mkdirs( basedir, scmRepository ); -- scmManager.checkOut( scmRepository, new ScmFileSet( basedir ), null ); -+ scmManager.getProviderByRepository( scmRepository ).checkOut( scmRepository, new ScmFileSet( basedir ), null ); - - if ( lastOne != null ) - { -- ScmResult result = scmManager.checkIn( scmRepository, -+ ScmResult result = scmManager.getProviderByRepository( scmRepository ).checkIn( scmRepository, - new ScmFileSet( lastOne.getParentFile(), lastOne ), null, - msg ); - if ( !result.isSuccess() ) -@@ -173,8 +173,8 @@ - } - - // TODO: detect if it is necessary to add first! -- scmManager.add( scmRepository, new ScmFileSet( basedir, scmFile ) ); -- ScmResult result = scmManager.checkIn( scmRepository, new ScmFileSet( basedir, scmFile ), null, msg ); -+ scmManager.getProviderByRepository( scmRepository ).add( scmRepository, new ScmFileSet( basedir, scmFile ) ); -+ ScmResult result = scmManager.getProviderByRepository( scmRepository ).checkIn( scmRepository, new ScmFileSet( basedir, scmFile ), null, msg ); - if ( !result.isSuccess() ) - { - throw new TransferFailedException( "Unable to commit file " + result.getCommandOutput() ); -@@ -214,7 +214,7 @@ - // TODO: ewwww - if ( !new File( basedir, ".svn" ).exists() && !new File( basedir, "CVS" ).exists() ) - { -- scmManager.add( scmRepository, new ScmFileSet( parent, basedir ) ); -+ scmManager.getProviderByRepository( scmRepository ).add( scmRepository, new ScmFileSet( parent, basedir ) ); - lastOne = basedir; - } - } -@@ -261,13 +261,13 @@ - // TODO: ewwww - if ( new File( basedir, ".svn" ).exists() || new File( basedir, "CVS" ).exists() ) - { -- scmManager.update( scmRepository, new ScmFileSet( basedir ), null ); -+ scmManager.getProviderByRepository( scmRepository ).update( scmRepository, new ScmFileSet( basedir ), null ); - } - else - { - // TODO: this should be checking out a full hierachy (requires the -d equiv) - basedir.mkdirs(); -- scmManager.checkOut( scmRepository, new ScmFileSet( basedir ), null ); -+ scmManager.getProviderByRepository( scmRepository ).checkOut( scmRepository, new ScmFileSet( basedir ), null ); - } - - if ( !scmFile.exists() ) diff --git a/wagon-1.0-ServletServer.patch b/wagon-1.0-ServletServer.patch deleted file mode 100644 index 00326b2..0000000 --- a/wagon-1.0-ServletServer.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/ServletServer.java.sav 2006-12-09 10:14:44.000000000 +0100 -+++ wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/ServletServer.java 2006-12-09 10:15:17.000000000 +0100 -@@ -128,7 +128,7 @@ - { - server.start(); - } -- catch ( MultiException e ) -+ catch ( Exception e ) - { - throw new StartingException( "Error starting the jetty webdav server: ", e ); - } diff --git a/wagon-1.0-TraditionalUIKeyboardInteractive.patch b/wagon-1.0-TraditionalUIKeyboardInteractive.patch deleted file mode 100644 index 2373eb4..0000000 --- a/wagon-1.0-TraditionalUIKeyboardInteractive.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/TraditionalUIKeyboardInteractive.java.sav 2005-10-10 18:37:16.000000000 +0200 -+++ wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/TraditionalUIKeyboardInteractive.java 2005-11-04 12:41:30.000000000 +0100 -@@ -16,6 +16,7 @@ - * limitations under the License. - */ - -+import java.util.regex.Pattern; - import com.jcraft.jsch.UIKeyboardInteractive; - import org.apache.maven.wagon.authentication.AuthenticationInfo; - -@@ -52,7 +53,7 @@ - String[] ret; - - if ( prompt.length == echo.length && prompt.length == 1 && !echo[0] && -- prompt[0].toLowerCase().contains( "password" ) ) -+ Pattern.matches(".*password.*", prompt[0].toLowerCase() ) ) - { - - ret = new String[1]; diff --git a/wagon-1.0-WebDavWagon.patch b/wagon-1.0-WebDavWagon.patch deleted file mode 100644 index 207b0a2..0000000 --- a/wagon-1.0-WebDavWagon.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java.sav 2006-06-13 00:14:37.000000000 +0200 -+++ wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java 2006-12-08 17:07:57.000000000 +0100 -@@ -138,13 +138,9 @@ - throw new ConnectionException( "Connection Exception: " + url + " " + he.getReasonCode() + " " - + HttpStatus.getStatusText( he.getReasonCode() ), he ); - } -- catch ( URIException urie ) -+ catch ( Exception e ) - { -- throw new ConnectionException( "Connection Exception: " + urie.getReason(), urie ); -- } -- catch ( IOException ioe ) -- { -- throw new ConnectionException( "Connection Exception: " + ioe.getMessage(), ioe ); -+ throw new ConnectionException( "Connection Exception: " , e ); - } - } - diff --git a/wagon-1.0-disable-webdav.patch b/wagon-1.0-disable-webdav.patch deleted file mode 100644 index b61100b..0000000 --- a/wagon-1.0-disable-webdav.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up ./wagon-providers/pom.xml.sav ./wagon-providers/pom.xml ---- ./wagon-providers/pom.xml.sav 2006-12-12 16:51:47.000000000 -0500 -+++ ./wagon-providers/pom.xml 2008-11-25 23:54:54.000000000 -0500 -@@ -20,7 +20,9 @@ - wagon-ssh-common-test - wagon-ssh - wagon-ssh-ganymed -+ - - - diff --git a/wagon-1.0-file-provider-build.xml b/wagon-1.0-file-provider-build.xml deleted file mode 100644 index 1e881aa..0000000 --- a/wagon-1.0-file-provider-build.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-ftp-provider-build.xml b/wagon-1.0-ftp-provider-build.xml deleted file mode 100644 index 77fb0f5..0000000 --- a/wagon-1.0-ftp-provider-build.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-http-lightweight-provider-build.xml b/wagon-1.0-http-lightweight-provider-build.xml deleted file mode 100644 index 247379b..0000000 --- a/wagon-1.0-http-lightweight-provider-build.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-http-provider-build.xml b/wagon-1.0-http-provider-build.xml deleted file mode 100644 index d1b97f7..0000000 --- a/wagon-1.0-http-provider-build.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-http-shared-provider-build.xml b/wagon-1.0-http-shared-provider-build.xml deleted file mode 100644 index c350ee4..0000000 --- a/wagon-1.0-http-shared-provider-build.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-pom_xml.patch b/wagon-1.0-pom_xml.patch deleted file mode 100644 index 30c6a9d..0000000 --- a/wagon-1.0-pom_xml.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- pom.xml.sav 2007-03-13 16:07:47.000000000 +0100 -+++ pom.xml 2007-03-13 16:08:10.000000000 +0100 -@@ -72,6 +72,7 @@ - wagon-provider-api - wagon-provider-test - wagon-providers -+ wagon-site - - - diff --git a/wagon-1.0-provider-api-build.xml b/wagon-1.0-provider-api-build.xml deleted file mode 100644 index cffee37..0000000 --- a/wagon-1.0-provider-api-build.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-provider-api-index.patch b/wagon-1.0-provider-api-index.patch deleted file mode 100644 index ac76574..0000000 --- a/wagon-1.0-provider-api-index.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wagon-provider-api/xdocs/index.xml.sav 2005-11-02 09:33:29.000000000 +0100 -+++ wagon-provider-api/xdocs/index.xml 2005-11-02 09:34:06.000000000 +0100 -@@ -14,7 +14,7 @@ - The "Wagon API" project defines a simple API for transfering resources - (artifacts) to and from repositories. The word repository is used in this contextx as - it is commonly used in -- Maven -+ Maven - And means a storage of artfacts. - Wagon is a helper project for Maven and it is planned that Wagon will be used in feature - versions of Maven. diff --git a/wagon-1.0-provider-test-build.xml b/wagon-1.0-provider-test-build.xml deleted file mode 100644 index 6f4c46b..0000000 --- a/wagon-1.0-provider-test-build.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-site.xml b/wagon-1.0-site.xml deleted file mode 100644 index e62fa94..0000000 --- a/wagon-1.0-site.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - Wagon - http://maven.apache.org/maven2/images/apache-maven-project-2.png - http://maven.apache.org/wagon - - - http://maven.apache.org/maven2/images/maven-logo-2.gif - - - org.apache.maven.skins - maven-default-skin - 1.0 - - - - - - - - - - - - - - - ${reports} - - diff --git a/wagon-1.0-ssh-common-provider-build.xml b/wagon-1.0-ssh-common-provider-build.xml deleted file mode 100644 index 74fdcdf..0000000 --- a/wagon-1.0-ssh-common-provider-build.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-ssh-common-test-provider-build.xml b/wagon-1.0-ssh-common-test-provider-build.xml deleted file mode 100644 index a52896f..0000000 --- a/wagon-1.0-ssh-common-test-provider-build.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-ssh-external-provider-build.xml b/wagon-1.0-ssh-external-provider-build.xml deleted file mode 100644 index 1bd79a7..0000000 --- a/wagon-1.0-ssh-external-provider-build.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-ssh-ganymed-provider-build.xml b/wagon-1.0-ssh-ganymed-provider-build.xml deleted file mode 100644 index f16ef08..0000000 --- a/wagon-1.0-ssh-ganymed-provider-build.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-ssh-provider-build.xml b/wagon-1.0-ssh-provider-build.xml deleted file mode 100644 index 7a9e68f..0000000 --- a/wagon-1.0-ssh-provider-build.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wagon-1.0-wagon-ftp-pom_xml.patch b/wagon-1.0-wagon-ftp-pom_xml.patch deleted file mode 100644 index eb28398..0000000 --- a/wagon-1.0-wagon-ftp-pom_xml.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- wagon-providers/wagon-ftp/pom.xml.sav 2007-04-04 17:49:01.000000000 +0200 -+++ wagon-providers/wagon-ftp/pom.xml 2007-04-04 17:50:04.000000000 +0200 -@@ -29,4 +29,15 @@ - test - - -- -\ No newline at end of file -+ -+ -+ -+ org.apache.maven.plugins -+ maven-surefire-plugin -+ -+ true -+ -+ -+ -+ -+ diff --git a/wagon-1.0-wagon-http-lightweight-pom_xml.patch b/wagon-1.0-wagon-http-lightweight-pom_xml.patch deleted file mode 100644 index 7733d60..0000000 --- a/wagon-1.0-wagon-http-lightweight-pom_xml.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- wagon-providers/wagon-http-lightweight/pom.xml.sav 2006-12-12 22:51:47.000000000 +0100 -+++ wagon-providers/wagon-http-lightweight/pom.xml 2007-03-15 10:21:29.000000000 +0100 -@@ -19,9 +19,9 @@ - - - -- ${pom.groupId} -+ org.apache.maven.wagon - wagon-http-shared -- ${pom.version} -+ 1.0-beta-2 - - - xml-apis -@@ -40,5 +40,17 @@ - - - -+ -+ jetty -+ jetty -+ 4.2.10 -+ test -+ -+ -+ servletapi -+ servletapi -+ 2.3 -+ test -+ - -- -\ No newline at end of file -+ diff --git a/wagon-1.0-wagon-http-pom_xml.patch b/wagon-1.0-wagon-http-pom_xml.patch deleted file mode 100644 index 2353982..0000000 --- a/wagon-1.0-wagon-http-pom_xml.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- wagon-providers/wagon-http/pom.xml.sav 2006-12-12 22:51:47.000000000 +0100 -+++ wagon-providers/wagon-http/pom.xml 2007-03-15 10:23:14.000000000 +0100 -@@ -18,9 +18,9 @@ - - - -- ${pom.groupId} -+ org.apache.maven.wagon - wagon-http-shared -- ${pom.version} -+ 1.0-beta-2 - - - plexus -@@ -45,5 +45,17 @@ - commons-httpclient - 2.0.2 - -+ -+ jetty -+ jetty -+ 4.2.10 -+ test -+ -+ -+ servletapi -+ servletapi -+ 2.3 -+ test -+ - -- -\ No newline at end of file -+ diff --git a/wagon-1.0-wagon-webdav-pom_xml.patch b/wagon-1.0-wagon-webdav-pom_xml.patch deleted file mode 100644 index ebb8f0d..0000000 --- a/wagon-1.0-wagon-webdav-pom_xml.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- wagon-providers/wagon-webdav/pom.xml.sav 2006-12-12 22:51:47.000000000 +0100 -+++ wagon-providers/wagon-webdav/pom.xml 2007-03-12 17:51:47.000000000 +0100 -@@ -46,5 +46,20 @@ - 4.2.12 - test - -+ -+ commons-httpclient -+ commons-httpclient -+ 3.0 -+ -+ -+ jetty -+ jetty -+ 4.2.10 -+ -+ -+ servletapi -+ servletapi -+ 2.3 -+ - - diff --git a/wagon-1.0-webdav-provider-build.xml b/wagon-1.0-webdav-provider-build.xml deleted file mode 100644 index 806ef31..0000000 --- a/wagon-1.0-webdav-provider-build.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================================= WARNING ================================ - Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. - ========================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -