diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..11e002f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/httpcomponents-client-4.3.6-src.tar.gz diff --git a/.rh-java-common-httpcomponents-client.metadata b/.rh-java-common-httpcomponents-client.metadata new file mode 100644 index 0000000..e595e42 --- /dev/null +++ b/.rh-java-common-httpcomponents-client.metadata @@ -0,0 +1 @@ +c52bccf73c222d21e356aeb46748c956ee43dee8 SOURCES/httpcomponents-client-4.3.6-src.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SPECS/httpcomponents-client.spec b/SPECS/httpcomponents-client.spec new file mode 100644 index 0000000..42c86d5 --- /dev/null +++ b/SPECS/httpcomponents-client.spec @@ -0,0 +1,279 @@ +%global pkg_name httpcomponents-client +%{?scl:%scl_package %{pkg_name}} +%{?java_common_find_provides_and_requires} + +%global base_name httpcomponents + +Name: %{?scl_prefix}%{pkg_name} +Summary: HTTP agent implementation based on httpcomponents HttpCore +Version: 4.3.6 +Release: 1.2%{?dist} +License: ASL 2.0 +URL: http://hc.apache.org/ +Source0: http://archive.apache.org/dist/httpcomponents/httpclient/source/%{pkg_name}-%{version}-src.tar.gz + +BuildArch: noarch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(commons-codec:commons-codec) +BuildRequires: %{?scl_prefix}mvn(commons-logging:commons-logging) +BuildRequires: %{?scl_prefix}mvn(org.apache.httpcomponents:httpcore) +BuildRequires: %{?scl_prefix_maven}mvn(org.apache.httpcomponents:project:pom:) +%if 0%{?fedora} +# Test dependencies +BuildRequires: %{?scl_prefix_maven}mvn(org.mockito:mockito-core) +BuildRequires: %{?scl_prefix}mvn(junit:junit) +%endif + +%description +HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on +httpcomponents HttpCore. It also provides reusable components for +client-side authentication, HTTP state management, and HTTP connection +management. HttpComponents Client is a successor of and replacement +for Commons HttpClient 3.x. Users of Commons HttpClient are strongly +encouraged to upgrade. + +%package javadoc +Summary: API documentation for %{pkg_name} + +%description javadoc +%{summary}. + + +%prep +%setup -q -n %{pkg_name}-%{version} +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +set -e -x + +# Remove optional build deps not available in Fedora +%pom_disable_module httpclient-cache +%pom_disable_module httpclient-osgi +%pom_disable_module fluent-hc +%pom_remove_plugin :maven-checkstyle-plugin +%if !0%{?fedora} +%pom_remove_dep :mockito-core httpclient +%endif + +# Add proper Apache felix bundle plugin instructions +# so that we get a reasonable OSGi manifest. +for module in httpclient httpmime; do + %pom_xpath_remove "pom:project/pom:packaging" $module + %pom_xpath_inject "pom:project" "bundle" $module +done + +# Make httpmime into bundle +%pom_xpath_inject pom:build/pom:plugins " + + org.apache.felix + maven-bundle-plugin + true + " httpmime + +# Make httpclient into bundle +%pom_xpath_inject pom:reporting/pom:plugins " + + org.apache.felix + maven-bundle-plugin + + + * + + !org.apache.avalon.framework.logger,!org.apache.log,!org.apache.log4j,* + + + " httpclient +%pom_xpath_inject pom:build/pom:plugins " + + org.apache.felix + maven-bundle-plugin + true + + + org.apache.http.*,!org.apache.http.param + + <_nouses>true + !org.apache.avalon.framework.logger,!org.apache.log,!org.apache.log4j,* + + true + + " httpclient +%{?scl:EOF} + + + +%build +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +set -e -x +%mvn_file ":{*}" httpcomponents/@1 + +# Build with tests enabled on Fedora +%if 0%{?fedora} +%mvn_build +%else +%mvn_build -f +%endif +%{?scl:EOF} + + +%install +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +set -e -x +%mvn_install +%{?scl:EOF} + + +%files -f .mfiles +%doc LICENSE.txt NOTICE.txt +%doc README.txt RELEASE_NOTES.txt + +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt NOTICE.txt + +%changelog +* Tue Jan 13 2015 Michael Simacek - 4.3.6-1.2 +- Mass rebuild 2015-01-13 + +* Tue Jan 13 2015 Michal Srb - 4.3.6-1.1 +- Update to 4.3.6 + +* Mon Jan 12 2015 Michael Simacek - 4.2.5-4.12 +- Rebuild to regenerate requires + +* Fri Jan 09 2015 Michal Srb - 4.2.5-4.11 +- Mass rebuild 2015-01-09 + +* Tue Dec 16 2014 Mikolaj Izdebski - 4.2.5-4.10 +- Migrate requires and build-requires to rh-java-common + +* Mon Dec 15 2014 Mikolaj Izdebski - 4.2.5-4.9 +- Mass rebuild 2014-12-15 + +* Mon Dec 15 2014 Mikolaj Izdebski - 4.2.5-4.8 +- Rebuild for rh-java-common collection + +* Tue Aug 12 2014 Michal Srb - 4.2.5-4.7 +- Fix MITM security vulnerability +- Resolves: CVE-2014-3577 + +* Mon May 26 2014 Mikolaj Izdebski - 4.2.5-4.6 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 4.2.5-4.5 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 4.2.5-4.4 +- Mass rebuild 2014-02-18 + +* Mon Feb 17 2014 Mikolaj Izdebski - 4.2.5-4.3 +- SCL-ize build-requires + +* Thu Feb 13 2014 Mikolaj Izdebski - 4.2.5-4.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 4.2.5-4.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 4.2.5-4 +- Mass rebuild 2013-12-27 + +* Fri Jun 28 2013 Mikolaj Izdebski - 4.2.5-3 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Mon Jun 10 2013 Michal Srb - 4.2.5-2 +- Enable tests on Fedora + +* Thu Apr 25 2013 Michal Srb - 4.2.5-1 +- Update to upstream version 4.2.5 + +* Thu Apr 11 2013 Michal Srb - 4.2.4-1 +- Update to upstream version 4.2.4 + +* Wed Feb 06 2013 Java SIG - 4.2.3-3 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Fri Jan 25 2013 Michal Srb - 4.2.3-2 +- Build with xmvn +- Disable fluent-hc module + +* Thu Jan 24 2013 Mikolaj Izdebski - 4.2.3-1 +- Update to upstream version 4.2.3 + +* Thu Oct 25 2012 Mikolaj Izdebski - 4.2.2-1 +- Update to upstream version 4.2.2 + +* Wed Aug 1 2012 Mikolaj Izdebski - 4.2.1-3 +- Fix OSGi manifest in httpmime + +* Fri Jul 27 2012 Mikolaj Izdebski - 4.2.1-2 +- Install NOTICE.txt file +- Fix javadir directory ownership +- Fix directory permissions +- Preserve timestamps +- Replace add_to_maven_depmap with add_maven_depmap + +* Fri Jul 27 2012 Mikolaj Izdebski - 4.2.1-1 +- Update to upstream version 4.2.1 +- Convert patches to POM macros + +* Thu Jul 19 2012 Fedora Release Engineering - 4.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed May 2 2012 Alexander Kurtakov 4.1.3-3 +- Do not export org.apache.http.param in osgi. + +* Mon Mar 26 2012 Alexander Kurtakov 4.1.3-2 +- Do not export * but only org.apache.http.* . +- Do not generate uses clauses in the manifest. + +* Thu Mar 1 2012 Stanislav Ochotnicky 4.1.3-1 +- Update to latest upstream bugfix + +* Fri Jan 13 2012 Fedora Release Engineering - 4.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Aug 16 2011 Stanislav Ochotnicky - 4.1.2-1 +- Update to latest upstream (4.1.2) +- Minor tweaks according to guidelines + +* Fri Jul 15 2011 Severin Gehwolf 4.1.1-3 +- Fix for RH Bz#718830. Add instructions so as to not + Import-Package optional dependencies. + +* Thu Apr 7 2011 Severin Gehwolf 4.1.1-2 +- Add BR/R apache-commons-codec, since httpcomponents-client's + MANIFEST.MF has an Import-Package: org.apache.commons.codec + header. + +* Tue Mar 29 2011 Stanislav Ochotnicky - 4.1.1-1 +- New upstream bugfix version (4.1.1) + +* Tue Mar 15 2011 Severin Gehwolf 4.1-6 +- Explicitly set PrivatePackage to the empty set, so as to + export all packages. + +* Thu Mar 10 2011 Alexander Kurtakov 4.1-5 +- OSGi export more packages. + +* Fri Feb 25 2011 Alexander Kurtakov 4.1-4 +- Build httpmime module. + +* Fri Feb 18 2011 Alexander Kurtakov 4.1-3 +- Don't use basename as an identifier. + +* Fri Feb 18 2011 Alexander Kurtakov 4.1-2 +- OSGify properly. +- Install into %{_javadir}/%{basename}. + +* Thu Feb 17 2011 Alexander Kurtakov 4.1-1 +- Update to latest upstream version. + +* Wed Feb 09 2011 Fedora Release Engineering - 4.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Dec 22 2010 Stanislav Ochotnicky - 4.0.3-2 +- Added license to javadoc subpackage + +* Mon Dec 20 2010 Stanislav Ochotnicky - 4.0.3-1 +- Initial version