[Jpackage-commits] dist/maven-wagon/JPP-6 .cvsignore, 1.2, 1.3 disable-tck.patch, NONE, 1.1 maven-wagon.spec, 1.9, 1.10 sources, 1.2, 1.3 wagon-1.0-ServletServer.patch, 1.1, NONE wagon-1.0-WebDavWagon.patch, 1.1, NONE wagon-1.0-disable-webdav.patch, 1.1, NONE wagon-1.0-file-provider-build.xml, 1.1, NONE wagon-1.0-ftp-provider-build.xml, 1.1, NONE wagon-1.0-http-lightweight-provider-build.xml, 1.1, NONE wagon-1.0-http-provider-build.xml, 1.1, NONE wagon-1.0-http-shared-provider-build.xml, 1.1, NONE wagon-1.0-jpp-depmap.xml, 1.2, 1.3 wagon-1.0-pom_xml.patch, 1.1, NONE wagon-1.0-provider-api-build.xml, 1.1, NONE wagon-1.0-provider-test-build.xml, 1.1, NONE wagon-1.0-site.xml, 1.1, NONE wagon-1.0-ssh-common-provider-build.xml, 1.1, NONE wagon-1.0-ssh-common-test-provider-build.xml, 1.1, NONE wagon-1.0-ssh-external-provider-build.xml, 1.1, NONE wagon-1.0-ssh-ganymed-provider-build.xml, 1.1, NONE wagon-1.0-ssh-provider-build.xml, 1.1, NONE wagon-1.0-wagon-ftp-pom_xml.patch, 1.1, NONE wagon-1.0-wagon-http-lightweight-pom_xml.patch, 1.1, NO NE wagon-1.0-wagon-http-pom_xml.patch, 1.1, NONE wagon-1.0-wagon-webdav-pom_xml.patch, 1.2, NONE wagon-1.0-webdav-provider-build.xml, 1.1, NONE wagon-http-shared-pom_xml.patch, NONE, 1.1 wagon-jackrabbit-pom.patch, NONE, 1.1

David Walluck david at ryu.zarb.org
Tue Dec 21 20:56:42 CET 2010


Update of /home/projects/jpackage/cvs/dist/maven-wagon/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv1734

Modified Files:
	.cvsignore maven-wagon.spec sources wagon-1.0-jpp-depmap.xml 
Added Files:
	disable-tck.patch wagon-http-shared-pom_xml.patch 
	wagon-jackrabbit-pom.patch 
Removed Files:
	wagon-1.0-ServletServer.patch wagon-1.0-WebDavWagon.patch 
	wagon-1.0-disable-webdav.patch 
	wagon-1.0-file-provider-build.xml 
	wagon-1.0-ftp-provider-build.xml 
	wagon-1.0-http-lightweight-provider-build.xml 
	wagon-1.0-http-provider-build.xml 
	wagon-1.0-http-shared-provider-build.xml 
	wagon-1.0-pom_xml.patch wagon-1.0-provider-api-build.xml 
	wagon-1.0-provider-test-build.xml wagon-1.0-site.xml 
	wagon-1.0-ssh-common-provider-build.xml 
	wagon-1.0-ssh-common-test-provider-build.xml 
	wagon-1.0-ssh-external-provider-build.xml 
	wagon-1.0-ssh-ganymed-provider-build.xml 
	wagon-1.0-ssh-provider-build.xml 
	wagon-1.0-wagon-ftp-pom_xml.patch 
	wagon-1.0-wagon-http-lightweight-pom_xml.patch 
	wagon-1.0-wagon-http-pom_xml.patch 
	wagon-1.0-wagon-webdav-pom_xml.patch 
	wagon-1.0-webdav-provider-build.xml 
Log Message:
- 1.0-beta-7

--- wagon-1.0-file-provider-build.xml DELETED ---

--- wagon-1.0-site.xml DELETED ---

Index: wagon-1.0-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-wagon/JPP-6/wagon-1.0-jpp-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** wagon-1.0-jpp-depmap.xml	6 Jan 2009 03:19:20 -0000	1.2
--- wagon-1.0-jpp-depmap.xml	21 Dec 2010 19:56:39 -0000	1.3
***************
*** 2,5 ****
--- 2,29 ----
    <dependency>
  	<maven>
+ 	  <groupId>com.thoughtworks.qdox</groupId>
+ 	  <artifactId>qdox</artifactId>
+ 	  <version>1.6.3</version>
+ 	</maven>
+ 	<jpp>
+ 	  <groupId>JPP</groupId>
+ 	  <artifactId>qdox161</artifactId>
+ 	  <version>1.6.1</version>
+ 	</jpp>
+   </dependency>
+   <dependency>
+ 	<maven>
+ 	  <groupId>org.mortbay.jetty</groupId>
+ 	  <artifactId>servlet-api</artifactId>
+ 	  <version>2.5-20081211</version>
+ 	</maven>
+ 	<jpp>
+ 	  <groupId>JPP</groupId>
+ 	  <artifactId>servlet_2_5_api</artifactId>
+ 	  <version>2.5</version>
+ 	</jpp>
+   </dependency>
+   <dependency>
+ 	<maven>
  	  <groupId>org.codehaus.plexus</groupId>
  	  <artifactId>plexus-ftpd</artifactId>
***************
*** 269,271 ****
--- 293,305 ----
      </maven>
    </dependency>
+ 	<dependency>
+ 	  <maven>
+ 		<groupId>org.codehaus.plexus</groupId>
+ 		<artifactId>plexus-container-default</artifactId>
+ 	  </maven>
+ 	  <jpp>
+ 		<groupId>JPP/plexus</groupId>
+ 		<artifactId>container-default</artifactId>
+ 	  </jpp>
+ 	</dependency>
  </dependencies>

--- wagon-1.0-provider-api-build.xml DELETED ---

--- wagon-1.0-disable-webdav.patch DELETED ---

--- wagon-1.0-http-shared-provider-build.xml DELETED ---

--- wagon-1.0-WebDavWagon.patch DELETED ---

--- wagon-1.0-ssh-common-provider-build.xml DELETED ---

--- wagon-1.0-wagon-webdav-pom_xml.patch DELETED ---

--- wagon-1.0-wagon-http-lightweight-pom_xml.patch DELETED ---

--- wagon-1.0-ssh-provider-build.xml DELETED ---

--- wagon-1.0-ssh-ganymed-provider-build.xml DELETED ---

--- wagon-1.0-ssh-external-provider-build.xml DELETED ---

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-wagon/JPP-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	28 May 2008 19:13:50 -0000	1.2
--- .cvsignore	21 Dec 2010 19:56:39 -0000	1.3
***************
*** 1 ****
- wagon-1.0-beta-2-src.tar.gz
--- 0 ----

--- wagon-1.0-webdav-provider-build.xml DELETED ---

--- NEW FILE: wagon-http-shared-pom_xml.patch ---
--- wagon-providers/wagon-http-shared/pom.xml.orig	2009-06-26 03:35:55.126611000 +0800
+++ wagon-providers/wagon-http-shared/pom.xml	2010-05-14 17:20:51.094694917 +0800
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>nekohtml</groupId>
-      <artifactId>xercesMinimal</artifactId>
-      <version>1.9.6.2</version>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
+      <version>2.9.1</version>
     </dependency>
     <dependency>
       <groupId>nekohtml</groupId>

--- wagon-1.0-ftp-provider-build.xml DELETED ---

--- wagon-1.0-provider-test-build.xml DELETED ---

--- wagon-1.0-pom_xml.patch DELETED ---

Index: maven-wagon.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-wagon/JPP-6/maven-wagon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** maven-wagon.spec	28 Apr 2009 02:31:57 -0000	1.9
--- maven-wagon.spec	21 Dec 2010 19:56:39 -0000	1.10
***************
*** 1,3 ****
! # Copyright (c) 2000-2007, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 29,100 ****
  #
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
! 
! # If you don't want to build with maven, and use straight ant instead,
! # give rpmbuild option '--without maven'
! 
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
! 
! %define bname     wagon
! %define blevel    beta-2
! 
! %define bname     wagon
  
  # 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.b2.6%{?dist}
  Epoch:          0
  Summary:        Tools to manage artifacts and deployment
! License:        Apache Software License
  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-2/
! # tar czvf wagon-1.0-beta-2-src.tar.gz wagon-1.0-beta-2
! 
  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"
- 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
  
! 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
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
- %if ! %{gcj_support}
  BuildArch:      noarch
- %endif
  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
--- 29,65 ----
  #
  
! %global bname     wagon
! %global blevel    beta-7
  
  # 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.
  
  Name:           maven-%{bname}
  Version:        1.0
! Release:        0.7.b7.1%{?dist}
  Epoch:          0
  Summary:        Tools to manage artifacts and deployment
! License:        ASL 2.0
  Group:          Development/Java
  URL:            http://maven.apache.org/wagon
! # svn export http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-beta-7/
! # tar caf wagon-1.0-beta-7.tar.xz wagon-1.0-beta-7
! # Exported revision 1051016.
! Source0:        %{bname}-%{version}-%{blevel}.tar.xz
  Source1:        wagon-1.0-jpp-depmap.xml
  
! Patch0:         wagon-http-shared-pom_xml.patch
! Patch1:         disable-tck.patch
! Patch2:         wagon-jackrabbit-pom.patch
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  BuildArch:      noarch
  BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  ant >= 0:1.6
  BuildRequires:  junit
  BuildRequires:  maven2 >= 0:2.0.8
+ BuildRequires:  maven2-common-poms
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
***************
*** 104,112 ****
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
! BuildRequires:  maven2-plugin-surefire = 2.3
! BuildRequires:  maven-surefire-provider-junit = 2.3
! BuildRequires:  maven2-default-skin
! %endif
  BuildRequires:  classworlds
  BuildRequires:  concurrent
  BuildRequires:  ganymed-ssh2
--- 69,82 ----
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
! BuildRequires:  maven2-stylus-skin
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-surefire-provider-junit 
! BuildRequires:  maven2-plugin-enforcer
! #BuildRequires:  maven2-default-skin
! BuildRequires:  plexus-maven-plugin
! BuildRequires: maven-shared-reporting-impl
! BuildRequires:  xerces-j2
  BuildRequires:  classworlds
+ BuildRequires:  nekohtml
  BuildRequires:  concurrent
  BuildRequires:  ganymed-ssh2
***************
*** 122,137 ****
  BuildRequires:  plexus-interactivity
  BuildRequires:  plexus-utils
  BuildRequires:  servletapi5
  BuildRequires:  xml-commons-apis
! %if %{gcj_support}
! BuildRequires:    java-gcj-compat-devel
! Requires(post):   java-gcj-compat
! Requires(postun): java-gcj-compat
! %endif
  
  Requires:       ganymed-ssh2
  Requires:       jakarta-commons-httpclient
  Requires:       jakarta-commons-net
! #Requires:       jakarta-slide-webdavclient
  Requires:       jsch
  Requires:       jtidy
--- 92,107 ----
  BuildRequires:  plexus-interactivity
  BuildRequires:  plexus-utils
+ BuildRequires:  tomcat5
  BuildRequires:  servletapi5
  BuildRequires:  xml-commons-apis
! BuildRequires:  easymock
! BuildRequires:  maven-scm-test
! BuildRequires:  apache-commons-net >= 0:2.0
! BuildRequires:  jackrabbit >= 0:1.5.0
  
  Requires:       ganymed-ssh2
  Requires:       jakarta-commons-httpclient
  Requires:       jakarta-commons-net
! #Requires:      jakarta-slide-webdavclient
  Requires:       jsch
  Requires:       jtidy
***************
*** 139,146 ****
  Requires:       plexus-utils
  Requires:       xml-commons-apis
  
  %description
! Maven Wagon is a transport abstraction that is used in Maven's 
! artifact and repository handling code. Currently wagon has the 
  following providers:
  * File
--- 109,121 ----
  Requires:       plexus-utils
  Requires:       xml-commons-apis
+ Requires:       nekohtml
+ Requires:       xerces-j2
+ Requires:       maven-scm-test
+ Requires:       apache-commons-net >= 0:2.0
+ Requires:       jackrabbit >= 0:1.5.0
  
  %description
! Maven Wagon is a transport abstraction that is used in Maven's
! artifact and repository handling code. Currently wagon has the
  following providers:
  * File
***************
*** 153,163 ****
  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}
--- 128,136 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
! Requires:       jpackage-utils
  
  %description javadoc
  Javadoc for %{name}.
  
  %package manual
  Summary:        Documents for %{name}
***************
*** 166,218 ****
  %description manual
  Documents for %{name}.
- %endif
  
  %prep
  %setup -q -n %{bname}-%{version}-%{blevel}
- 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
- 
  
  %patch0 -b .sav
  %patch1 -b .sav
  %patch2 -b .sav
- %patch3 -b .sav
- %patch4 -b .sav
- %patch5 -b .sav
- %patch6 -b .sav
- %patch7 -b .sav
  
  # To wire out jetty, plexus-avalon-personality and plexus-ftpd requirement
--- 139,149 ----
***************
*** 222,229 ****
  rm -f wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
  rm -f wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonGzipTest.java
  
! %build
! %if %{with_maven}
  
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
--- 153,165 ----
  rm -f wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
  rm -f wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonGzipTest.java
+ #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
  
! %if 0
! # skip site generation due to the failure of maven site
! rm -rf src/site/site.xml
! %endif
  
+ %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
***************
*** 231,410 ****
  mvn-jpp \
          -e \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          -Dmaven.test.failure.ignore=true \
!         install 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-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-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
! 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
  rm -rf $RPM_BUILD_ROOT
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
  install -m 644 \
    wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-api-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-provider-api %{version} JPP/%{name} provider-api
  install -m 644 \
    wagon-providers/wagon-file/target/wagon-file-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/file-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-file %{version} JPP/%{name} file
  install -m 644 \
    wagon-providers/wagon-ftp/target/wagon-ftp-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/ftp-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-ftp %{version} JPP/%{name} ftp
  install -m 644 \
    wagon-providers/wagon-http-lightweight/target/wagon-http-lightweight-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/http-lightweight-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-http-lightweight %{version} JPP/%{name} http-lightweight
  install -m 644 \
    wagon-providers/wagon-http-shared/target/wagon-http-shared-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/http-shared-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-http-shared %{version} JPP/%{name} http-shared
  install -m 644 \
!   wagon-providers/wagon-http/target/wagon-http-%{version}-%{blevel}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}/http-%{version}.jar
  
- %add_to_maven_depmap org.apache.maven.wagon wagon-http %{version} JPP/%{name} http
  install -m 644 \
    wagon-providers/wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common %{version} JPP/%{name} ssh-common
  install -m 644 \
    wagon-providers/wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-test-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common-test %{version} JPP/%{name} ssh-common-test
  install -m 644 \
    wagon-providers/wagon-ssh-external/target/wagon-ssh-external-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-external-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-ssh-external %{version} JPP/%{name} ssh-external
- install -m 644 \
-   wagon-providers/wagon-ssh-ganymed/target/wagon-ssh-ganymed-%{version}-%{blevel}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-ganymed-%{version}.jar
- %add_to_maven_depmap org.apache.maven.wagon wagon-ssh-ganymed %{version} JPP/%{name} ssh-ganymed
- install -m 644 \
-   wagon-providers/wagon-ssh/target/wagon-ssh-%{version}-%{blevel}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-%{version}.jar
- %add_to_maven_depmap org.apache.maven.wagon wagon-ssh %{version} JPP/%{name} ssh
- #install -m 644 \
- #  wagon-providers/wagon-webdav/target/wagon-webdav-%{version}-%{blevel}.jar \
- #  $RPM_BUILD_ROOT%{_javadir}/%{name}/webdav-%{version}.jar
- #%%add_to_maven_depmap org.apache.maven.wagon wagon-webdav %{version} JPP/%{name} webdav
  
! # Until webdav is available, map it to an empty dep
! %add_to_maven_depmap org.apache.maven.wagon wagon-webdav %{version} JPP/maven2 empty-dep
  
  install -m 644 \
--- 167,243 ----
  mvn-jpp \
          -e \
!         -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          -Dmaven.test.failure.ignore=true \
!         -Dmaven.test.skip=true \
!         -Daggregate=true \
!         install javadoc:aggregate site
  
  %install
  rm -rf $RPM_BUILD_ROOT
+ 
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+ 
  install -m 644 \
    wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-api-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-provider-api %{version} JPP/%{name} provider-api
+ 
  install -m 644 \
    wagon-providers/wagon-file/target/wagon-file-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/file-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-file %{version} JPP/%{name} file
+ 
  install -m 644 \
    wagon-providers/wagon-ftp/target/wagon-ftp-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/ftp-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-ftp %{version} JPP/%{name} ftp
+ 
+ install -m 644 \
+   wagon-providers/wagon-http/target/wagon-http-%{version}-%{blevel}.jar \
+   $RPM_BUILD_ROOT%{_javadir}/%{name}/http-%{version}.jar
+ 
+ %add_to_maven_depmap org.apache.maven.wagon wagon-http %{version} JPP/%{name} http
+ 
  install -m 644 \
    wagon-providers/wagon-http-lightweight/target/wagon-http-lightweight-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/http-lightweight-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-http-lightweight %{version} JPP/%{name} http-lightweight
+ 
  install -m 644 \
    wagon-providers/wagon-http-shared/target/wagon-http-shared-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/http-shared-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-http-shared %{version} JPP/%{name} http-shared
+ 
  install -m 644 \
!   wagon-providers/wagon-scm/target/wagon-scm-%{version}-%{blevel}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}/scm-%{version}.jar
! %add_to_maven_depmap org.apache.maven.wagon wagon-scm %{version} JPP/%{name} scm
! 
! install -m 644 \
!   wagon-providers/wagon-ssh/target/wagon-ssh-%{version}-%{blevel}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-%{version}.jar
! %add_to_maven_depmap org.apache.maven.wagon wagon-ssh %{version} JPP/%{name} ssh
  
  install -m 644 \
    wagon-providers/wagon-ssh-common/target/wagon-ssh-common-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common %{version} JPP/%{name} ssh-common
+ 
  install -m 644 \
    wagon-providers/wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-test-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common-test %{version} JPP/%{name} ssh-common-test
+ 
  install -m 644 \
    wagon-providers/wagon-ssh-external/target/wagon-ssh-external-%{version}-%{blevel}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-external-%{version}.jar
  %add_to_maven_depmap org.apache.maven.wagon wagon-ssh-external %{version} JPP/%{name} ssh-external
  
! install -m 644 \
!   wagon-providers/wagon-webdav-jackrabbit/target/wagon-webdav-jackrabbit-%{version}-%{blevel}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}/web-jackrabbit-%{version}.jar
! %add_to_maven_depmap org.apache.maven.wagon wagon-webdav-jackrabbit %{version} JPP/%{name} webdav-jackrabbit
  
  install -m 644 \
***************
*** 435,438 ****
--- 268,273 ----
  install -m 644 wagon-providers/wagon-http/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-http.pom
+ install -m 644 wagon-providers/wagon-scm/pom.xml \
+     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-scm.pom
  install -m 644 wagon-providers/wagon-ssh-common/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-common.pom
***************
*** 441,596 ****
  install -m 644 wagon-providers/wagon-ssh-external/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-external.pom
- install -m 644 wagon-providers/wagon-ssh-ganymed/pom.xml \
-     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-ganymed.pom
  install -m 644 wagon-providers/wagon-ssh/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh.pom
! #install -m 644 wagon-providers/wagon-webdav/pom.xml \
! #    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-webdav.pom
! 
! # 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}/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
  
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  # manual
  install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! install -m 644 wagon-provider-api/LICENSE.txt \
                  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! 
! #%if %{with_maven}
! #cp -pr wagon-site/target/site/* \
! #                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! #%endif
! 
! %if %{gcj_support}
! %{_bindir}/aot-compile-rpm
! %endif
  
  %clean
  rm -rf $RPM_BUILD_ROOT
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
  
  %post
  %update_maven_depmap
- %if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
  
  %postun
  %update_maven_depmap
- %if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
  
  %files
  %defattr(-,root,root,-)
  %{_javadir}/*
! %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
  %{_datadir}/maven2/poms/*.pom
  %{_mavendepmapfragdir}
- %if %{gcj_support}
- %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
- %attr(-,root,root) %{_libdir}/gcj/%{name}/*%{version}.jar.*
- %endif
  
  %files javadoc
  %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
- %if %{with_maven}
  %files manual
  %defattr(-,root,root,-)
  %doc %{_docdir}/%{name}-%{version}
- %endif
  
  %changelog
! * Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.6
! - Rebuild with new maven2-2.0.8 built in non-bootstrap mode
  
! * Mon Mar 16 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.5
! - rebuild with new maven2 2.0.8-9 built in bootstrap mode
  
! * Tue Mar 10 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.4
! - rebuild with maven2 2.0.8 built in bootstrap mode
! - FIXME: javadoc:javadoc didn't generate javadoc, commented all apidocs resources 
  
! * Tue Jan 14 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.3jpp.3
! - re-build with gcj
  
! * Tue Jan 13 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.3jpp.2
! - re-build with maven
  
! * Tue Jan 06 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.3jpp.1
! - Import from dbhole's maven 2.0.8 packages list 
  
! * Mon Jan 07 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.b2.3jpp.1
! - Merge with Fedora
  
! * Wed Apr 04 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.2jpp
! - Extend depmap to excalibur dependencies
! - Skip wagon-ftp tests
!  
! * Wed Mar 14 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b2.1jpp
! - Upgrade to 1.0-beta-2
! - Switch to maven2
! - Reimplement optional building without maven2
! - Add copyright notice
! - Add gcj_support option
  
  * Tue Mar 13 2007 Matt Wringe <mwringe at redhat.com> - 0:1.0-0.1.a5.3jpp.1
--- 276,369 ----
  install -m 644 wagon-providers/wagon-ssh-external/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-external.pom
  install -m 644 wagon-providers/wagon-ssh/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh.pom
! install -m 644 wagon-providers/wagon-webdav-jackrabbit/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-webdav-jackrabbit.pom
  
  
! # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  # manual
  install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! cp -pr target/site/* \
                  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/apidocs
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %post
  %update_maven_depmap
  
  %postun
  %update_maven_depmap
  
  %files
  %defattr(-,root,root,-)
  %{_javadir}/*
! #%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
  %{_datadir}/maven2/poms/*.pom
  %{_mavendepmapfragdir}
  
  %files javadoc
  %defattr(-,root,root,-)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %files manual
  %defattr(-,root,root,-)
  %doc %{_docdir}/%{name}-%{version}
  
  %changelog
! * Mon Dec 20 2010 David Walluck <dwalluck at redhat.com> 0:1.0-0.7.b7.1
! - 1.0-beta-7
! - enable jackrabbit
! - enable apache-commons-net
  
! * Thu Sep 30 2010 Hui Wang <huwang at redhat.com> 0:1.0-0.2.b6.5
! - Add BR maven2-common-poms and maven-shared-reporting-impl
  
! * Fri Aug 13 2010 Hui Wang <huwang at redhat.com> 0:1.0-0.2.b6.4
! - Enable javadoc
! - Rebuild with maven221 
! - Add BR maven-scm-test
  
! * Fri Aug 13 2010 Hui Wang <huwang at redhat.com> 0:1.0-0.2.b6.3
! - Disable javadoc temperarily until newer javadoc is ready
! - Fix FtpWagon.java by sed until jakarta-commons-net-2.0 is ready
  
! * Fri May 14 2010 Yong Yang <yyang at redhat.com> 0:1.0-0.2.b6.2
! - Create patch for wagon-http-shared pom.xml
  
! * Wed May 12 2010 Yong Yang <yyang at redhat.com> 0:1.0-0.2.b6.1
! - Update to beta 6, build with with_maven 1
  
! * Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.2.b2.7
! - Remove gcj parts.
  
! * Wed Aug 19 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.2.b2.6
! - Update to beta2 - sync with jpackage.
! 
! * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.3.a5.3.5
! - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
! 
! * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.2.a5.3.5
! - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
! 
! * Mon Dec  1 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0:1.0-0.1.a5.3.5
! - include missing dir below _docdir
! 
! * Fri Oct 03 2008 Matt Wringe <mwringe at redhat.com> - 0:1.0-0.1.a5.3.4
! - added patch to make it compatible with the newer version of jsch
! 
! * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.0-0.1.a5.3.3
! - drop repotag
! - fix license tag
! 
! * Sat Apr 05 2008 Matt Wringe <mwringe at redhat.com> - 0:1.0-0.1.a5.3jpp.2
! - Rebuild with new version of jsch
  
  * Tue Mar 13 2007 Matt Wringe <mwringe at redhat.com> - 0:1.0-0.1.a5.3jpp.1
***************
*** 609,615 ****
  * Thu Dec 22 2005 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.a5.2jpp
  - Commented out potentially superfluous dependencies.
! - Disabled wagon-scm 
  
  * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a5.1jpp
  - First JPackage build
- 
--- 382,387 ----
  * Thu Dec 22 2005 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.a5.2jpp
  - Commented out potentially superfluous dependencies.
! - Disabled wagon-scm
  
  * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a5.1jpp
  - First JPackage build

--- wagon-1.0-ssh-common-test-provider-build.xml DELETED ---

--- wagon-1.0-wagon-http-pom_xml.patch DELETED ---

--- NEW FILE: disable-tck.patch ---
--- pom.xml.sav	2010-11-13 23:20:29.000000000 +0200
+++ pom.xml	2010-12-13 19:10:47.319780363 +0200
@@ -163,7 +163,7 @@ under the License.
     <module>wagon-provider-api</module>
     <module>wagon-providers</module>
     <module>wagon-provider-test</module>
-    <module>wagon-tcks</module>
+    <!--module>wagon-tcks</module-->
   </modules>
 
   <properties>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-wagon/JPP-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	28 May 2008 19:13:50 -0000	1.2
--- sources	21 Dec 2010 19:56:39 -0000	1.3
***************
*** 1 ****
- d00d2cf71f010f238da1e175398f762c  wagon-1.0-beta-2-src.tar.gz
--- 0 ----

--- wagon-1.0-ServletServer.patch DELETED ---

--- wagon-1.0-wagon-ftp-pom_xml.patch DELETED ---

--- NEW FILE: wagon-jackrabbit-pom.patch ---
--- wagon-providers/wagon-webdav-jackrabbit/pom.xml.orig	2010-12-20 04:45:02.203141667 -0500
+++ wagon-providers/wagon-webdav-jackrabbit/pom.xml	2010-12-20 04:47:26.488583631 -0500
@@ -94,7 +94,7 @@
             <configuration>
               <descriptors>
                 <descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
-                <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+                <descriptor>${project.build.directory}/classes/META-INF/plexus/components.xml</descriptor>
               </descriptors>
             </configuration>
             <goals>

--- wagon-1.0-http-provider-build.xml DELETED ---

--- wagon-1.0-http-lightweight-provider-build.xml DELETED ---




More information about the JPackage-commits mailing list