[httpcomponents-core] Bump release to fix my mistake with the release.
by Alexander Kurtakov
commit 578200f98beb2c45c0fbe31d2faafa02c9e3cba3
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Mar 11 21:02:55 2011 +0200
Bump release to fix my mistake with the release.
httpcomponents-core.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index 55d49fe..71a5baa 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -3,7 +3,7 @@
Name: httpcomponents-core
Summary: Set of low level Java HTTP transport components for HTTP services
Version: 4.1
-Release: 3%{?dist}
+Release: 5%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -97,6 +97,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/*
%changelog
+* Fri Mar 11 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-5
+- Bump release to fix my mistake with the release.
+
* Thu Mar 10 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-3
- Export all packages.
13 years
[httpcomponents-client/f15/master] (7 commits) ...OSGi export more packages.
by Alexander Kurtakov
Summary of changes:
44f50c7... Update to latest upstream version. (*)
2df83c8... BR easymock-classextension (*)
6b2c05e... Really fix the pom and deps. (*)
f0fe040... OSGify properly. (*)
4c7fbe5... Don't use basename as an identifier. (*)
913b07b... Build httpmime module. (*)
8e3aaf5... OSGi export more packages. (*)
(*) This commit already existed in another branch; no separate mail sent
13 years
[httpcomponents-client] OSGi export more packages.
by Alexander Kurtakov
commit 8e3aaf5c2b06f1b3d3ac0bf2d5c25d1e2b6191a2
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Mar 10 21:30:17 2011 +0200
OSGi export more packages.
0001-Cleanup-pom.patch | 153 ++++++++++++++++++++++---------------------
httpcomponents-client.spec | 5 +-
2 files changed, 82 insertions(+), 76 deletions(-)
---
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
index ac7b967..2ed82da 100644
--- a/0001-Cleanup-pom.patch
+++ b/0001-Cleanup-pom.patch
@@ -1,76 +1,5 @@
---- httpclient/pom.xml.sav 2011-01-17 22:00:53.000000000 +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>
- </dependency>
-- <dependency>
-- <groupId>org.easymock</groupId>
-- <artifactId>easymockclassextension</artifactId>
-- <version>${easymock.version}</version>
-- <scope>test</scope>
-- </dependency>
- </dependencies>
-
- <properties>
-@@ -122,25 +116,12 @@
- </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>
-+ <plugin>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>maven-bundle-plugin</artifactId>
-+ <extensions>true</extensions>
-+ </plugin>
-+ </plugins>
- </build>
-
- <reporting>
-@@ -165,14 +146,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-25 20:17:20.519335750 +0200
+--- pom.xml.sav 2011-01-17 15:00:53.000000000 -0500
++++ pom.xml 2011-03-10 09:45:01.330282001 -0500
@@ -81,28 +81,11 @@
<modules>
<module>httpclient</module>
@@ -183,8 +112,82 @@
</reporting>
</project>
---- httpmime/pom.xml.sav 2011-01-17 22:00:44.000000000 +0200
-+++ httpmime/pom.xml 2011-02-25 20:19:09.191564653 +0200
+--- httpclient/pom.xml.sav 2011-01-17 15:00:53.000000000 -0500
++++ httpclient/pom.xml 2011-03-10 09:50:50.829281988 -0500
+@@ -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>
+ </dependency>
+- <dependency>
+- <groupId>org.easymock</groupId>
+- <artifactId>easymockclassextension</artifactId>
+- <version>${easymock.version}</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <properties>
+@@ -122,25 +116,17 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
+ <configuration>
+- <flushPolicy>threaded</flushPolicy>
+- <flushInterval>100</flushInterval>
+- <targetPercentage>50%</targetPercentage>
++ <instructions>
++ <Export-Package>*</Export-Package>
++ </instructions>
+ </configuration>
+- <executions>
+- <execution>
+- <id>site</id>
+- <phase>pre-site</phase>
+- <goals>
+- <goal>instrument</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+- </plugins>
++ </plugin>
++ </plugins>
+ </build>
+
+ <reporting>
+@@ -165,14 +151,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>
+
+--- httpmime/pom.xml.sav 2011-01-17 15:00:44.000000000 -0500
++++ httpmime/pom.xml 2011-03-10 09:45:01.330282001 -0500
@@ -38,7 +38,7 @@
HttpComponents HttpClient - MIME coded entities
</description>
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index b2bf294..3cce83e 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -3,7 +3,7 @@
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -92,6 +92,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Thu Mar 10 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-5
+- OSGi export more packages.
+
* Fri Feb 25 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-4
- Build httpmime module.
13 years
[httpcomponents-core] Export all packages.
by Alexander Kurtakov
commit 4ea93fd1f3256f2bfd5fe2753863dfae60617ebf
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Mar 10 21:21:04 2011 +0200
Export all packages.
httpcomponents-core.spec | 7 +++++--
osgify.patch | 22 ++++++++++++++++------
2 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index e4dba5f..55d49fe 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -3,7 +3,7 @@
Name: httpcomponents-core
Summary: Set of low level Java HTTP transport components for HTTP services
Version: 4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -52,7 +52,7 @@ Requires: jpackage-utils
%build
# start using install again when bundle plugin is updated to 2.1.0
-mvn-rpmbuild package javadoc:aggregate
+mvn-rpmbuild -Dmaven.test.failure.ignore=true package javadoc:aggregate
%install
install -d %{buildroot}/%{_mavenpomdir}
@@ -97,6 +97,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/*
%changelog
+* Thu Mar 10 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-3
+- Export all packages.
+
* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-2
- Don't use basename it's part of coreutils.
diff --git a/osgify.patch b/osgify.patch
index 0613552..5c6afb1 100644
--- a/osgify.patch
+++ b/osgify.patch
@@ -1,5 +1,5 @@
---- httpcore/pom.xml.sav 2011-02-18 10:30:46.956382888 +0200
-+++ httpcore/pom.xml 2011-02-18 10:32:23.412697802 +0200
+--- httpcore/pom.xml.sav 2011-03-10 11:17:08.579282001 -0500
++++ httpcore/pom.xml 2011-03-10 11:17:32.655282215 -0500
@@ -39,7 +39,7 @@
HttpComponents Core (blocking I/O)
</description>
@@ -9,7 +9,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -111,6 +111,11 @@
+@@ -111,6 +111,16 @@
</archive>
</configuration>
</plugin>
@@ -17,12 +17,17 @@
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
++ <configuration>
++ <instructions>
++ <Export-Package>*</Export-Package>
++ </instructions>
++ </configuration>
+ </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
+--- httpcore-nio/pom.xml.sav 2011-03-10 11:17:08.579282001 -0500
++++ httpcore-nio/pom.xml 2011-03-10 11:17:57.120281971 -0500
@@ -39,7 +39,7 @@
HttpComponents Core (non-blocking I/O)
</description>
@@ -32,7 +37,7 @@
<dependencies>
<dependency>
-@@ -103,6 +103,11 @@
+@@ -103,6 +103,16 @@
</archive>
</configuration>
</plugin>
@@ -40,6 +45,11 @@
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
++ <configuration>
++ <instructions>
++ <Export-Package>*</Export-Package>
++ </instructions>
++ </configuration>
+ </plugin>
</plugins>
</build>
13 years
[apache-commons-math/f14/master] Update to 2.2
by Mohamed ElMorabity
commit 2830d078924fd9789544c717963add2a1278104f
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu Mar 10 16:28:48 2011 +0100
Update to 2.2
.gitignore | 1 +
...he-commons-math-2.2-remove_clirr_from_pom.patch | 19 ++++++++++---------
apache-commons-math.spec | 16 +++++++++++-----
sources | 2 +-
4 files changed, 23 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 68e9658..f8e7695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
commons-math-2.0-src.tar.gz
/commons-math-2.1-src.tar.gz
+/commons-math-2.2-src.tar.gz
diff --git a/commons-math-remove-clirr-from-pom.patch b/apache-commons-math-2.2-remove_clirr_from_pom.patch
similarity index 63%
rename from commons-math-remove-clirr-from-pom.patch
rename to apache-commons-math-2.2-remove_clirr_from_pom.patch
index adf545a..357a5a0 100644
--- a/commons-math-remove-clirr-from-pom.patch
+++ b/apache-commons-math-2.2-remove_clirr_from_pom.patch
@@ -1,13 +1,14 @@
---- pom.xml 2010-10-22 03:37:42.930470377 +0200
-+++ pom.xml 2010-10-22 03:38:07.199469768 +0200
-@@ -269,17 +269,6 @@
+diff -up commons-math-2.2-src/pom.xml.orig commons-math-2.2-src/pom.xml
+--- commons-math-2.2-src/pom.xml.orig 2011-02-26 19:14:36.000000000 +0100
++++ commons-math-2.2-src/pom.xml 2011-03-10 15:05:36.988244002 +0100
+@@ -280,17 +280,6 @@
</descriptors>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
-- <version>2.2.2</version>
+- <version>2.3</version>
- <executions>
- <execution>
- <goals>
@@ -16,18 +17,18 @@
- </executions>
- </plugin>
</plugins>
- </build>
- <reporting>
-@@ -324,14 +313,6 @@
+ <resources>
+ <resource>
+@@ -350,14 +339,6 @@
<headerFile>${basedir}/license-header.txt</headerFile>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
-- <version>2.2.2</version>
+- <version>2.2.3</version>
- <configuration>
-- <minSeverity>info</minSeverity>
+- <minSeverity>${minSeverity}</minSeverity>
- </configuration>
- </plugin>
</plugins>
diff --git a/apache-commons-math.spec b/apache-commons-math.spec
index 16d1d0a..d152f3a 100644
--- a/apache-commons-math.spec
+++ b/apache-commons-math.spec
@@ -2,15 +2,15 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 2.1
-Release: 3%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Summary: Java library of lightweight mathematics and statistics components
Group: Development/Libraries
License: ASL 1.1 and ASL 2.0 and BSD
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
-Patch0: %{short_name}-remove-clirr-from-pom.patch
+Patch0: %{name}-2.2-remove_clirr_from_pom.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel >= 1:1.6.0
@@ -26,7 +26,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-resources-plugin
-#Should be replaced by maven-surefire-plugin after f15 branch
+# Should be replaced by maven-surefire-plugin after f15 branch
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit4
Requires: java >= 1:1.6.0
@@ -52,7 +52,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch0 -p0
+%patch0 -p1 -b .remove_clirr_from_pom
%build
@@ -113,6 +113,12 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Thu Mar 10 2011 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.2-1
+- Update to 2.2
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Wed Dec 29 2010 Mat Booth <fedora(a)matbooth.co.uk> 2.1-3
- Drop versioned jars and javadocs, fixes F15 upgrade path.
diff --git a/sources b/sources
index d5004c5..610c9ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e7f431d77e87888c79f74b0d5a603f0 commons-math-2.1-src.tar.gz
+6261d7991154c992477b32b8f3bea18b commons-math-2.2-src.tar.gz
13 years
[apache-commons-math/f15/master] Update to 2.2
by Mohamed ElMorabity
commit f42901476ba00435f7f791849438c72d81d849d0
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu Mar 10 16:07:29 2011 +0100
Update to 2.2
.gitignore | 1 +
...he-commons-math-2.2-remove_clirr_from_pom.patch | 19 ++++++++++---------
apache-commons-math.spec | 13 ++++++++-----
sources | 2 +-
4 files changed, 20 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 68e9658..f8e7695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
commons-math-2.0-src.tar.gz
/commons-math-2.1-src.tar.gz
+/commons-math-2.2-src.tar.gz
diff --git a/commons-math-remove-clirr-from-pom.patch b/apache-commons-math-2.2-remove_clirr_from_pom.patch
similarity index 63%
rename from commons-math-remove-clirr-from-pom.patch
rename to apache-commons-math-2.2-remove_clirr_from_pom.patch
index adf545a..357a5a0 100644
--- a/commons-math-remove-clirr-from-pom.patch
+++ b/apache-commons-math-2.2-remove_clirr_from_pom.patch
@@ -1,13 +1,14 @@
---- pom.xml 2010-10-22 03:37:42.930470377 +0200
-+++ pom.xml 2010-10-22 03:38:07.199469768 +0200
-@@ -269,17 +269,6 @@
+diff -up commons-math-2.2-src/pom.xml.orig commons-math-2.2-src/pom.xml
+--- commons-math-2.2-src/pom.xml.orig 2011-02-26 19:14:36.000000000 +0100
++++ commons-math-2.2-src/pom.xml 2011-03-10 15:05:36.988244002 +0100
+@@ -280,17 +280,6 @@
</descriptors>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
-- <version>2.2.2</version>
+- <version>2.3</version>
- <executions>
- <execution>
- <goals>
@@ -16,18 +17,18 @@
- </executions>
- </plugin>
</plugins>
- </build>
- <reporting>
-@@ -324,14 +313,6 @@
+ <resources>
+ <resource>
+@@ -350,14 +339,6 @@
<headerFile>${basedir}/license-header.txt</headerFile>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
-- <version>2.2.2</version>
+- <version>2.2.3</version>
- <configuration>
-- <minSeverity>info</minSeverity>
+- <minSeverity>${minSeverity}</minSeverity>
- </configuration>
- </plugin>
</plugins>
diff --git a/apache-commons-math.spec b/apache-commons-math.spec
index c242f7e..d152f3a 100644
--- a/apache-commons-math.spec
+++ b/apache-commons-math.spec
@@ -2,15 +2,15 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 2.1
-Release: 4%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Summary: Java library of lightweight mathematics and statistics components
Group: Development/Libraries
License: ASL 1.1 and ASL 2.0 and BSD
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
-Patch0: %{short_name}-remove-clirr-from-pom.patch
+Patch0: %{name}-2.2-remove_clirr_from_pom.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel >= 1:1.6.0
@@ -26,7 +26,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-resources-plugin
-#Should be replaced by maven-surefire-plugin after f15 branch
+# Should be replaced by maven-surefire-plugin after f15 branch
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit4
Requires: java >= 1:1.6.0
@@ -52,7 +52,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch0 -p0
+%patch0 -p1 -b .remove_clirr_from_pom
%build
@@ -113,6 +113,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Thu Mar 10 2011 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.2-1
+- Update to 2.2
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index d5004c5..610c9ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e7f431d77e87888c79f74b0d5a603f0 commons-math-2.1-src.tar.gz
+6261d7991154c992477b32b8f3bea18b commons-math-2.2-src.tar.gz
13 years