[maven-wagon] Update to 1.0 final.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Jul 27 08:47:56 UTC 2011
commit acbd2480e500a6d1458194e68e5ca30e6944d107
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Jul 27 11:47:21 2011 +0300
Update to 1.0 final.
.gitignore | 1 +
maven-wagon.spec | 95 +++++++++++++++++----------------------------
sources | 3 +-
wagon-1.0-jpp-depmap.xml | 43 ---------------------
4 files changed, 38 insertions(+), 104 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5bb45c0..ba33ccd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
wagon-1.0-beta-6-src.tar.gz
+wagon-1.0-source-release.zip
diff --git a/maven-wagon.spec b/maven-wagon.spec
index 9d9262c..d4fa44b 100644
--- a/maven-wagon.spec
+++ b/maven-wagon.spec
@@ -29,27 +29,18 @@
#
%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.3.b7.22%{?dist}
+Release: 1%{?dist}
Epoch: 0
Summary: Tools to manage artifacts and deployment
License: ASL 2.0
Group: Development/Java
URL: http://maven.apache.org/wagon
-Source0: wagon-1.0-%{blevel}-src.tar.xz
-# svn export http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-beta-7/
-# tar caf wagon-1.0-beta-7-src.tar.xz wagon-1.0-beta-7
+Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip
Source1: wagon-1.0-jpp-depmap.xml
-#patch for 1.0 beta-6
-Patch0: wagon-http-shared-pom_xml.patch
Patch1: disable-tck.patch
BuildArch: noarch
@@ -88,6 +79,7 @@ BuildRequires: plexus-utils
BuildRequires: servletapi5
BuildRequires: xml-commons-apis
BuildRequires: easymock
+BuildRequires: jsoup
Requires: ganymed-ssh2
Requires: jakarta-commons-httpclient
@@ -95,6 +87,7 @@ Requires: apache-commons-net
#Requires: jakarta-slide-webdavclient
Requires: jsch
Requires: jtidy
+Requires: jsoup
Requires: plexus-interactivity
Requires: plexus-utils
Requires: xml-commons-apis
@@ -127,21 +120,17 @@ Group: Development/Documentation
Documents for %{name}.
%prep
-%setup -q -n %{bname}-%{version}-%{blevel}
+%setup -q -n wagon-%{version}
#FIXME: have to drop wagon-webdav-jackrabbit until jackrabbit is available
sed -i "s|<module>wagon-webdav-jackrabbit</module>|<!-- <module>wagon-webdav-jackrabbit</module> -->|" wagon-providers/pom.xml
-%patch0 -b .sav
%patch1
# 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
-rm -f wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
rm -f wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonGzipTest.java
-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
%build
@@ -156,58 +145,58 @@ mvn-rpmbuild \
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 \
- wagon-provider-api/target/wagon-provider-api-%{version}-%{blevel}.jar \
+ wagon-provider-api/target/wagon-provider-api-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/provider-api.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 \
+ wagon-providers/wagon-file/target/wagon-file-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/file.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 \
+ wagon-providers/wagon-ftp/target/wagon-ftp-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/ftp.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 \
+ wagon-providers/wagon-http/target/wagon-http-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/http.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 \
+ wagon-providers/wagon-http-lightweight/target/wagon-http-lightweight-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/http-lightweight.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 \
+ wagon-providers/wagon-http-shared/target/wagon-http-shared-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/http-shared.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 \
+ wagon-providers/wagon-scm/target/wagon-scm-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/scm.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 \
+ wagon-providers/wagon-ssh/target/wagon-ssh-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/ssh.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 \
+ wagon-providers/wagon-ssh-common/target/wagon-ssh-common-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common.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 \
+ wagon-providers/wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-test.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 \
+ wagon-providers/wagon-ssh-external/target/wagon-ssh-external-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-external.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-external %{version} JPP/%{name} ssh-external
@@ -223,7 +212,7 @@ install -m 644 \
#%%add_to_maven_depmap org.apache.maven.wagon wagon-webdav %{version} JPP/%{name} webdav
install -m 644 \
- wagon-provider-test/target/wagon-provider-test-%{version}-%{blevel}.jar \
+ wagon-provider-test/target/wagon-provider-test-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/provider-test.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-provider-test %{version} JPP/%{name} provider-test
@@ -231,37 +220,37 @@ install -m 644 \
%add_to_maven_depmap org.apache.maven.wagon wagon-providers %{version} JPP/%{name} providers
# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -m 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-wagon.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-wagon.pom
install -m 644 wagon-provider-api/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-provider-api.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-provider-api.pom
install -m 644 wagon-provider-test/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-provider-test.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-provider-test.pom
install -m 644 wagon-providers/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-providers.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-providers.pom
install -m 644 wagon-providers/wagon-file/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-file.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-file.pom
install -m 644 wagon-providers/wagon-ftp/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ftp.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ftp.pom
install -m 644 wagon-providers/wagon-http-shared/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-http-shared.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-http-shared.pom
install -m 644 wagon-providers/wagon-http-lightweight/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-http-lightweight.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-http-lightweight.pom
install -m 644 wagon-providers/wagon-http/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-http.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/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
+ $RPM_BUILD_ROOT%{_mavenpomdir}/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
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ssh-common.pom
install -m 644 wagon-providers/wagon-ssh-common-test/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-common-test.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ssh-common-test.pom
install -m 644 wagon-providers/wagon-ssh-external/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-wagon-ssh-external.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/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
+ $RPM_BUILD_ROOT%{_mavenpomdir}/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
+# $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-webdav.pom
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -272,33 +261,21 @@ 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
-
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*.pom
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
%files manual
-%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Wed Jul 27 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-1
+- Update to 1.0 final.
+
* Tue Apr 26 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.3.b7.22
- Install wagon-providers depmap too.
diff --git a/sources b/sources
index 7160ddb..4fd9d2d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-9dc49550f70e1e4e4872ae0c95b5abcc wagon-1.0-beta-6-src.tar.gz
-0db197aca326d151d4ca8fda2564a80a wagon-1.0-beta-7-src.tar.xz
+bb6436c7ef29d357da962d67b5f62cb0 wagon-1.0-source-release.zip
diff --git a/wagon-1.0-jpp-depmap.xml b/wagon-1.0-jpp-depmap.xml
index 22c04fe..368327b 100644
--- a/wagon-1.0-jpp-depmap.xml
+++ b/wagon-1.0-jpp-depmap.xml
@@ -25,18 +25,6 @@
</dependency>
<dependency>
<maven>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- <version>2.3</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>servletapi5</artifactId>
- <version>2.4</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
<groupId>ch.ethz.ganymed</groupId>
<artifactId>ganymed-ssh2</artifactId>
<version>build210</version>
@@ -73,18 +61,6 @@
</dependency>
<dependency>
<maven>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-default-skin</artifactId>
- <version>1.0</version>
- </maven>
- <jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>default-skin</artifactId>
- <version>1.0</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
<groupId>avalon</groupId>
<artifactId>avalon-framework</artifactId>
<version>4.1.4</version>
@@ -217,18 +193,6 @@
</dependency>
<dependency>
<maven>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
- </maven>
- <jpp>
- <groupId>JPP/plexus</groupId>
- <artifactId>container-default</artifactId>
- <version>1.0</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
<groupId>cornerstone-connection</groupId>
<artifactId>cornerstone-connection-impl</artifactId>
<version>1.0</version>
@@ -249,13 +213,6 @@
</dependency>
<dependency>
<maven>
- <artifactId>jetty</artifactId>
- <groupId>jetty</groupId>
- <version>4.2.10</version>
- </maven>
- </dependency>
- <dependency>
- <maven>
<artifactId>plexus-jetty-httpd</artifactId>
<groupId>plexus</groupId>
<version>1.0-beta-1</version>
More information about the scm-commits
mailing list