[httpcomponents-core] on't use basename it's part of coreutils.
by Alexander Kurtakov
commit c0d9c7c67b8623abd1e7cedf781cb82f1997c034
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Feb 18 17:55:57 2011 +0200
on't use basename it's part of coreutils.
httpcomponents-core.spec | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index 7087657..e4dba5f 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -1,9 +1,9 @@
-%global basename httpcomponents
+%global base_name httpcomponents
Name: httpcomponents-core
Summary: Set of low level Java HTTP transport components for HTTP services
Version: 4.1
-Release: 4%{?dist}
+Release: 2%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -56,23 +56,23 @@ mvn-rpmbuild package javadoc:aggregate
%install
install -d %{buildroot}/%{_mavenpomdir}
-install -d %{buildroot}/%{_javadir}/%{basename}
+install -d %{buildroot}/%{_javadir}/%{base_name}
for m in httpcore httpcore-nio; do
# poms
- install -m 0644 $m/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-$m.pom
+ install -m 0644 $m/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-$m.pom
# jars - osgi doesn't have one
if [ -f $m/target/$m-%{version}.jar ];then
- install -m 0644 $m/target/$m-%{version}.jar %{buildroot}%{_javadir}/%{basename}/$m.jar
+ install -m 0644 $m/target/$m-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/$m.jar
fi
- %add_to_maven_depmap org.apache.httpcomponents $m %{version} JPP/%{basename} $m
+ %add_to_maven_depmap org.apache.httpcomponents $m %{version} JPP/%{base_name} $m
done
# parent
-install -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-%{name}.pom
-%add_to_maven_depmap org.apache.httpcomponents %{name} %{version} JPP/%{basename} %{name}
+install -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-%{name}.pom
+%add_to_maven_depmap org.apache.httpcomponents %{name} %{version} JPP/%{base_name} %{name}
# javadocs
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -97,6 +97,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/*
%changelog
+* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-2
+- Don't use basename it's part of coreutils.
+
* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-4
- Install into %{_javadir}/httpcomponents. We will use it for client libs too.
- Proper osgi info.
13 years, 2 months
[httpcomponents-client] OSGify properly.
by Alexander Kurtakov
commit f0fe040655e8c42547e0c0599e3fc528a1c5d670
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Feb 18 13:45:10 2011 +0200
OSGify properly.
Install into %{_javadir}/%{basename}.
0001-Cleanup-pom.patch | 20 +++++++++++++++++---
httpcomponents-client.spec | 32 ++++++++++++++++++--------------
2 files changed, 35 insertions(+), 17 deletions(-)
---
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
index 05e5e7e..d4ba8e6 100644
--- a/0001-Cleanup-pom.patch
+++ b/0001-Cleanup-pom.patch
@@ -106,7 +106,16 @@
</project>
--- httpclient/pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
-+++ httpclient/pom.xml 2011-02-18 11:05:10.474559948 +0200
++++ httpclient/pom.xml 2011-02-18 13:38:36.221371560 +0200
+@@ -38,7 +38,7 @@
+ HttpComponents Client (base module)
+ </description>
+ <url>http://hc.apache.org/httpcomponents-client</url>
+- <packaging>jar</packaging>
++ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
@@ -71,12 +71,6 @@
<version>${easymock.version}</version>
<scope>test</scope>
@@ -120,7 +129,7 @@
</dependencies>
<properties>
-@@ -122,25 +116,7 @@
+@@ -122,25 +116,12 @@
</execution>
</executions>
</plugin>
@@ -143,11 +152,16 @@
- </executions>
- </plugin>
- </plugins>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ </plugin>
+ </plugins>
</build>
<reporting>
-@@ -165,14 +141,6 @@
+@@ -165,14 +146,6 @@
</plugin>
<plugin>
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index af77b86..bcade7f 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -1,7 +1,9 @@
+%global basename httpcomponents
+
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -11,11 +13,9 @@ Patch0: 0001-Cleanup-pom.patch
BuildArch: noarch
-
BuildRequires: httpcomponents-project
BuildRequires: httpcomponents-core
-
Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: httpcomponents-core
@@ -37,7 +37,7 @@ Group: Documentation
Requires: jpackage-utils
%description javadoc
-%{summary}.
+API docs for %{name}.
%prep
@@ -46,25 +46,25 @@ Requires: jpackage-utils
%build
# skip httpmime, httpclient only. For httpmime we need org.apache.james:apache-mime4j
-cd httpclient
+pushd httpclient
mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
-
+popd
%install
cd httpclient
# jars
-install -D -m 0644 target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{name}/httpclient.jar
+install -D -m 0644 target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{basename}/httpclient.jar
# pom
install -D -m 0644 pom.xml \
- %{buildroot}/%{_mavenpomdir}/JPP.%{name}-httpclient.pom
-%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{name} httpclient
+ %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-httpclient.pom
+%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{basename} httpclient
# main pom
install -D -m 0644 ../pom.xml \
- %{buildroot}/%{_mavenpomdir}/JPP.%{name}-httpcomponents-client.pom
-%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version} JPP/%{name} httpcomponents-client
+ %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-httpcomponents-client.pom
+%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version} JPP/%{basename} httpcomponents-client
# javadocs
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -80,9 +80,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(-,root,root,-)
%doc README.txt LICENSE.txt RELEASE_NOTES.txt
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP.%{name}*.pom
-%{_javadir}/%{name}
+%{_mavendepmapfragdir}/%{basename}
+%{_mavenpomdir}/JPP.%{basename}*.pom
+%{_javadir}/%{basename}
%files javadoc
%defattr(-,root,root,-)
@@ -91,6 +91,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-2
+- OSGify properly.
+- Install into %{_javadir}/%{basename}.
+
* Thu Feb 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-1
- Update to latest upstream version.
13 years, 2 months
[httpcomponents-client] Really fix the pom and deps.
by Alexander Kurtakov
commit 6b2c05e436f5ea2673fdcd6fbfc7e4c0945ff89d
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Feb 18 11:09:22 2011 +0200
Really fix the pom and deps.
0001-Cleanup-pom.patch | 101 +++++++++++++++++++++++++-------------------
httpcomponents-client.spec | 1 -
2 files changed, 57 insertions(+), 45 deletions(-)
---
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
index 1a7621f..05e5e7e 100644
--- a/0001-Cleanup-pom.patch
+++ b/0001-Cleanup-pom.patch
@@ -1,47 +1,3 @@
---- httpclient/pom.xml.sav 2011-02-17 21:47:11.997569572 +0200
-+++ httpclient/pom.xml 2011-02-17 21:48:40.911717624 +0200
-@@ -122,25 +122,7 @@
- </execution>
- </executions>
- </plugin>
-- <plugin>
-- <groupId>com.atlassian.maven.plugins</groupId>
-- <artifactId>maven-clover2-plugin</artifactId>
-- <configuration>
-- <flushPolicy>threaded</flushPolicy>
-- <flushInterval>100</flushInterval>
-- <targetPercentage>50%</targetPercentage>
-- </configuration>
-- <executions>
-- <execution>
-- <id>site</id>
-- <phase>pre-site</phase>
-- <goals>
-- <goal>instrument</goal>
-- </goals>
-- </execution>
-- </executions>
-- </plugin>
-- </plugins>
-+ </plugins>
- </build>
-
- <reporting>
-@@ -165,14 +147,6 @@
- </plugin>
-
- <plugin>
-- <groupId>com.atlassian.maven.plugins</groupId>
-- <artifactId>maven-clover2-plugin</artifactId>
-- <configuration>
-- <jdk>1.5</jdk>
-- </configuration>
-- </plugin>
--
-- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
--- pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
+++ pom.xml 2011-02-17 22:03:40.828341546 +0200
@@ -88,21 +88,6 @@
@@ -149,3 +105,60 @@
</reporting>
</project>
+--- httpclient/pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
++++ httpclient/pom.xml 2011-02-18 11:05:10.474559948 +0200
+@@ -71,12 +71,6 @@
+ <version>${easymock.version}</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.easymock</groupId>
+- <artifactId>easymockclassextension</artifactId>
+- <version>${easymock.version}</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <properties>
+@@ -122,25 +116,7 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <flushPolicy>threaded</flushPolicy>
+- <flushInterval>100</flushInterval>
+- <targetPercentage>50%</targetPercentage>
+- </configuration>
+- <executions>
+- <execution>
+- <id>site</id>
+- <phase>pre-site</phase>
+- <goals>
+- <goal>instrument</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+- </plugins>
++ </plugins>
+ </build>
+
+ <reporting>
+@@ -165,14 +141,6 @@
+ </plugin>
+
+ <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <jdk>1.5</jdk>
+- </configuration>
+- </plugin>
+-
+- <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index c233a08..af77b86 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -14,7 +14,6 @@ BuildArch: noarch
BuildRequires: httpcomponents-project
BuildRequires: httpcomponents-core
-BuildRequires: easymock-classextension
Requires: java >= 1:1.6.0
13 years, 2 months
[httpcomponents-core] Proper osgi info
by Alexander Kurtakov
commit d514c44d606893e404975ecc9e4d936b3c29de82
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Feb 18 10:52:06 2011 +0200
Proper osgi info
Install into %{_javadir}/httpcomponents. We will use it for client
libs too.
httpcomponents-core.spec | 34 +++++++++++++++++++---------------
osgify.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 15 deletions(-)
---
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index fdbb08e..7087657 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -1,12 +1,15 @@
+%global basename httpcomponents
+
Name: httpcomponents-core
Summary: Set of low level Java HTTP transport components for HTTP services
Version: 4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
Source0: http://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-...
Patch0: 0001-Remove-unneeded-pom-dependencies.patch
+Patch1: osgify.patch
BuildArch: noarch
BuildRequires: httpcomponents-project
@@ -45,34 +48,31 @@ Requires: jpackage-utils
%prep
%setup -q
%patch0 -p1
+%patch1
%build
-export maven_repo_local=$(pwd)/.m2/repository
-install -d $maven_repo_local
-
# start using install again when bundle plugin is updated to 2.1.0
-mvn-jpp -Dmaven.repo.local=$maven_repo_local \
- package javadoc:aggregate
+mvn-rpmbuild package javadoc:aggregate
%install
install -d %{buildroot}/%{_mavenpomdir}
-install -d %{buildroot}/%{_javadir}/%{name}
+install -d %{buildroot}/%{_javadir}/%{basename}
-for m in httpcore httpcore-nio httpcore-osgi; do
+for m in httpcore httpcore-nio; do
# poms
- install -m 0644 $m/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}-$m.pom
+ install -m 0644 $m/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-$m.pom
# jars - osgi doesn't have one
if [ -f $m/target/$m-%{version}.jar ];then
- install -m 0644 $m/target/$m-%{version}.jar %{buildroot}%{_javadir}/%{name}/$m.jar
+ install -m 0644 $m/target/$m-%{version}.jar %{buildroot}%{_javadir}/%{basename}/$m.jar
fi
- %add_to_maven_depmap org.apache.httpcomponents $m %{version} JPP/%{name} $m
+ %add_to_maven_depmap org.apache.httpcomponents $m %{version} JPP/%{basename} $m
done
# parent
-install -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_to_maven_depmap org.apache.httpcomponents %{name} %{version} JPP/%{name} %{name}
+install -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-%{name}.pom
+%add_to_maven_depmap org.apache.httpcomponents %{name} %{version} JPP/%{basename} %{name}
# javadocs
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -88,8 +88,8 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%defattr(-,root,root,-)
%doc README.txt LICENSE.txt RELEASE_NOTES.txt
%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP.%{name}*.pom
-%{_javadir}/%{name}
+%{_mavenpomdir}/JPP.%{basename}*.pom
+%{_javadir}/%{basename}
%files javadoc
%doc LICENSE.txt
@@ -97,6 +97,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/*
%changelog
+* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-4
+- Install into %{_javadir}/httpcomponents. We will use it for client libs too.
+- Proper osgi info.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/osgify.patch b/osgify.patch
new file mode 100644
index 0000000..0613552
--- /dev/null
+++ b/osgify.patch
@@ -0,0 +1,46 @@
+--- httpcore/pom.xml.sav 2011-02-18 10:30:46.956382888 +0200
++++ httpcore/pom.xml 2011-02-18 10:32:23.412697802 +0200
+@@ -39,7 +39,7 @@
+ HttpComponents Core (blocking I/O)
+ </description>
+ <url>http://hc.apache.org/httpcomponents-core-ga/</url>
+- <packaging>jar</packaging>
++ <packaging>bundle</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+@@ -111,6 +111,11 @@
+ </archive>
+ </configuration>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ </plugin>
+ </plugins>
+ </build>
+
+--- httpcore-nio/pom.xml.sav 2011-02-18 10:34:29.238978764 +0200
++++ httpcore-nio/pom.xml 2011-02-18 10:35:23.813101329 +0200
+@@ -39,7 +39,7 @@
+ HttpComponents Core (non-blocking I/O)
+ </description>
+ <url>http://hc.apache.org/httpcomponents-core/</url>
+- <packaging>jar</packaging>
++ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+@@ -103,6 +103,11 @@
+ </archive>
+ </configuration>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ </plugin>
+ </plugins>
+ </build>
+
13 years, 2 months
[httpcomponents-client] BR easymock-classextension
by Alexander Kurtakov
commit 2df83c86aef3d3ada183b26f60ad35553f702545
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Feb 17 22:24:45 2011 +0200
BR easymock-classextension
httpcomponents-client.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index af77b86..c233a08 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -14,6 +14,7 @@ BuildArch: noarch
BuildRequires: httpcomponents-project
BuildRequires: httpcomponents-core
+BuildRequires: easymock-classextension
Requires: java >= 1:1.6.0
13 years, 2 months
[httpcomponents-client] Update to latest upstream version.
by Alexander Kurtakov
commit 44f50c78c4bd5b0bbdf85548dbc8e847f7367ad2
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Feb 17 22:09:45 2011 +0200
Update to latest upstream version.
.gitignore | 1 +
0001-Cleanup-pom.patch | 114 ++++++++++++++++++++++++++++++++-----------
httpcomponents-client.spec | 14 +++---
sources | 2 +-
4 files changed, 94 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 610c841..724c402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/httpcomponents-client-4.0.3-src.tar.gz
+httpcomponents-client-4.1-src.tar.gz
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
index 78c59dc..1a7621f 100644
--- a/0001-Cleanup-pom.patch
+++ b/0001-Cleanup-pom.patch
@@ -1,19 +1,8 @@
-From 00e8bdbfe680691c28ab6da5a40ca4ff020d5837 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Mon, 20 Dec 2010 15:56:06 +0100
-Subject: [PATCH] Cleanup pom
-
----
- pom.xml | 72 ---------------------------------------------------------------
- 1 files changed, 0 insertions(+), 72 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 3d0d20a..fce1fdd 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -144,78 +144,6 @@
- </tasks>
- </configuration>
+--- httpclient/pom.xml.sav 2011-02-17 21:47:11.997569572 +0200
++++ httpclient/pom.xml 2011-02-17 21:48:40.911717624 +0200
+@@ -122,25 +122,7 @@
+ </execution>
+ </executions>
</plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
@@ -29,24 +18,60 @@ index 3d0d20a..fce1fdd 100644
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
-- <goal>aggregate</goal>
-- <goal>save-history</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+- </plugins>
++ </plugins>
+ </build>
+
+ <reporting>
+@@ -165,14 +147,6 @@
+ </plugin>
+
+ <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <jdk>1.5</jdk>
+- </configuration>
+- </plugin>
+-
- <plugin>
-- <groupId>com.agilejava.docbkx</groupId>
-- <artifactId>docbkx-maven-plugin</artifactId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
+--- pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
++++ pom.xml 2011-02-17 22:03:40.828341546 +0200
+@@ -88,21 +88,6 @@
+ <build>
+ <plugins>
+ <plugin>
+- <artifactId>maven-notice-plugin</artifactId>
+- <groupId>org.apache.httpcomponents</groupId>
- <executions>
- <execution>
+- <id>attach-notice-license</id>
- <goals>
-- <goal>generate-html</goal>
-- <goal>generate-pdf</goal>
+- <goal>generate</goal>
- </goals>
-- <phase>pre-site</phase>
- </execution>
- </executions>
+- <configuration>
+- <projectTitle>Apache HttpComponents</projectTitle>
+- </configuration>
+- </plugin>
+- <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+@@ -189,49 +174,6 @@
+ </configuration>
+ </plugin>
+ <plugin>
+- <groupId>com.agilejava.docbkx</groupId>
+- <artifactId>docbkx-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.docbook</groupId>
@@ -65,7 +90,7 @@ index 3d0d20a..fce1fdd 100644
- <entities>
- <entity>
- <name>version</name>
-- <value>${pom.version}</value>
+- <value>${project.version}</value>
- </entity>
- </entities>
- <postProcess>
@@ -87,9 +112,40 @@ index 3d0d20a..fce1fdd 100644
- </postProcess>
- </configuration>
- </plugin>
-
- </plugins>
+- <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+@@ -252,14 +194,7 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>clirr-maven-plugin</artifactId>
+- <configuration>
+- <comparisonVersion>${comparisonVersion}</comparisonVersion>
+- </configuration>
+- </plugin>
+- </plugins>
++ </plugins>
</build>
---
-1.7.3.3
-
+
+ <reporting>
+@@ -280,15 +215,7 @@
+ </reportSets>
+ </plugin>
+
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>clirr-maven-plugin</artifactId>
+- <configuration>
+- <comparisonVersion>${comparisonVersion}</comparisonVersion>
+- </configuration>
+- </plugin>
+-
+- </plugins>
++ </plugins>
+ </reporting>
+
+ </project>
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index b17793b..af77b86 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -1,7 +1,7 @@
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
-Version: 4.0.3
-Release: 3%{?dist}
+Version: 4.1
+Release: 1%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -42,16 +42,13 @@ Requires: jpackage-utils
%prep
%setup -q
-%patch0 -p1
+%patch0 -b .sav
%build
# skip httpmime, httpclient only. For httpmime we need org.apache.james:apache-mime4j
cd httpclient
-export maven_repo_local=$(pwd)/.m2/repository
-install -d $maven_repo_local
-mvn-jpp -Dmaven.repo.local=$maven_repo_local \
- install javadoc:javadoc
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
%install
@@ -94,6 +91,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Thu Feb 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-1
+- Update to latest upstream version.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 02bacbd..f275dc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-003b803d1aa9c873c6d22e7471856254 httpcomponents-client-4.0.3-src.tar.gz
+1a50cf1c2eeac0ff29a3cd095ed19954 httpcomponents-client-4.1-src.tar.gz
13 years, 2 months
[httpcomponents-project] Require maven (version 3) now.
by Alexander Kurtakov
commit 436d2785d6d7907600be55861fbb9bebbffcecdf
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Feb 17 17:59:43 2011 +0200
Require maven (version 3) now.
httpcomponents-project.spec | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec
index 3ff9cf0..2958ec9 100644
--- a/httpcomponents-project.spec
+++ b/httpcomponents-project.spec
@@ -1,7 +1,7 @@
Name: httpcomponents-project
Summary: Common POM file for HttpComponents
Version: 4.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -17,7 +17,7 @@ BuildRequires: jpackage-utils
# Requires are dependencies from pom.xml. This project should only be required for building with maven.
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-Requires: maven2 >= 2.0.9
+Requires: maven
Requires: maven-antrun-plugin
Requires: maven-assembly-plugin
Requires: maven-clean-plugin
@@ -68,9 +68,11 @@ use it as runtime requirement.
%{_mavenpomdir}/JPP.%{name}.pom
%changelog
+* Thu Feb 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1.1-3
+- Require maven (version 3) now.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.1.1-1
- Initial version
-
13 years, 2 months
[maven-ant-tasks] (3 commits) ...Merge branch 'master' into f15
by Stanislav Ochotnicky
Summary of changes:
883e455... - Fix ant groupId to org.apache.ant, resolves FTBFS bug 660 (*)
5554eba... Install unversioned jar & javadocs (*)
1622e28... Merge branch 'master' into f15 (*)
(*) This commit already existed in another branch; no separate mail sent
13 years, 2 months
[maven-ant-tasks/f15/master: 3/3] Merge branch 'master' into f15
by Stanislav Ochotnicky
commit 1622e28f6b744500ba1690e890d3b6c04966a52c
Merge: 883e455 5554eba
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 16 17:59:24 2011 +0100
Merge branch 'master' into f15
Go back to linear history.
Conflicts:
maven-ant-tasks.spec
maven-ant-tasks.spec | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
---
13 years, 2 months