Hello community,
here is the log from the commit of package apache-commons-httpclient for
openSUSE:Factory checked in at 2019-02-04 21:23:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-httpclient (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-httpclient.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-httpclient"
Mon Feb 4 21:23:07 2019 rev:9 rq:667627 version:3.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-commons-httpclient/apache-commons-httpclient.changes
2018-07-24 17:30:27.191915530 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-httpclient.new.28833/apache-commons-httpclient.changes
2019-02-04 21:23:08.679628984 +0100
@@ -1,0 +2,5 @@
+Mon Jan 21 15:28:32 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Add maven pom file and clean-up the spec file
+
+-------------------------------------------------------------------
New:
----
commons-httpclient-3.1.pom
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-httpclient.spec ++++++
--- /var/tmp/diff_new_pack.wvGNGS/_old 2019-02-04 21:23:09.223628851 +0100
+++ /var/tmp/diff_new_pack.wvGNGS/_new 2019-02-04 21:23:09.227628850 +0100
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-httpclient
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -23,21 +23,23 @@
Summary: Feature rich package for accessing resources via HTTP
License: Apache-2.0
Group: Development/Libraries/Java
-Url: http://hc.apache.org/httpclient-3.x/
-Source0:
http://www.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-%{version}-src.tar.gz
+URL: http://hc.apache.org/httpclient-3.x/
+Source0:
http://www.apache.org/dist/httpcomponents/commons-httpclient/source/%{short_name}-%{version}-src.tar.gz
+Source1:
http://repo.maven.apache.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
Patch0: %{name}-disablecryptotests.patch
# Add OSGi MANIFEST.MF bits
Patch1: %{name}-addosgimanifest.patch
Patch2: %{name}-encoding.patch
#PATCH-FIX-UPSTREAM: bnc#803332
#https://issues.apache.org/jira/secure/attachment/12560251/CVE-2012-5783-2.patch
-Patch3: commons-httpclient-CVE-2012-5783-2.patch
+Patch3: %{short_name}-CVE-2012-5783-2.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: commons-codec
BuildRequires: commons-logging >= 1.0.3
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
+BuildRequires: javapackages-local
BuildRequires: junit
Requires: commons-codec
Requires: commons-logging >= 1.0.3
@@ -46,7 +48,6 @@
Obsoletes: jakarta-%{short_name} < %{version}
Provides: jakarta-%{short_name}3 = %{version}
Obsoletes: jakarta-%{short_name}3 < %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -64,22 +65,22 @@
for distributed communication.
%package javadoc
-Summary: Developer documentation for apache-commons-httpclient
+Summary: Developer documentation for %{name}
Group: Development/Libraries/Java
%description javadoc
-Developer documentation for apache-commons-httpclient in JavaDoc
+Developer documentation for %{name} in JavaDoc
format.
%{summary}.
%package demo
-Summary: Demonstration files for apache-commons-httpclient
+Summary: Demonstration files for %{name}
Group: Development/Libraries/Java
Requires: %{name} = %{version}
%description demo
-Demonstration files for apache-commons-httpclient. NOTE: It is
+Demonstration files for %{name}. NOTE: It is
possible that some demonstration files are specially prepared for SUN
Java runtime environment. If they fail with IBM or BEA Java, the
package itself does not need to be broken.
@@ -87,16 +88,16 @@
%{summary}.
%package manual
-Summary: Manual for apache-commons-httpclient
+Summary: Manual for %{name}
Group: Development/Libraries/Java
%description manual
-Manual for apache-commons-httpclient
+Manual for %{name}
%{summary}.
%prep
-%setup -q -n commons-httpclient-%{version}
+%setup -q -n %{short_name}-%{version}
mkdir lib # duh
rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej
@@ -138,17 +139,22 @@
%install
# jars
mkdir -p %{buildroot}%{_javadir}
-cp -p dist/commons-httpclient.jar \
+cp -p dist/%{short_name}.jar \
%{buildroot}%{_javadir}/%{name}.jar
# compat symlink
pushd %{buildroot}%{_javadir}
-ln -s apache-commons-httpclient.jar apache-commons-httpclient3.jar
-ln -s apache-commons-httpclient.jar commons-httpclient3.jar
-ln -s apache-commons-httpclient.jar commons-httpclient.jar
-ln -s apache-commons-httpclient.jar jakarta-commons-httpclient.jar
-ln -s apache-commons-httpclient.jar jakarta-commons-httpclient3.jar
+ln -s %{name}.jar %{name}3.jar
+ln -s %{name}.jar %{short_name}3.jar
+ln -s %{name}.jar %{short_name}.jar
+ln -s %{name}.jar jakarta-%{short_name}.jar
+ln -s %{name}.jar jakarta-%{short_name}3.jar
popd
+# pom
+mkdir -p %{buildroot}%{_mavenpomdir}
+cp -p %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar -a apache:commons-httpclient
+
# javadoc
mkdir -p %{buildroot}%{_javadocdir}
mv dist/docs/api %{buildroot}%{_javadocdir}/%{name}
@@ -166,13 +172,20 @@
%files
%defattr(0644,root,root,0755)
-%doc LICENSE.txt README.txt RELEASE_NOTES.txt
+%license LICENSE.txt
+%doc README.txt RELEASE_NOTES.txt
%{_javadir}/%{name}.jar
-%{_javadir}/apache-commons-httpclient3.jar
-%{_javadir}/commons-httpclient3.jar
-%{_javadir}/commons-httpclient.jar
-%{_javadir}/jakarta-commons-httpclient3.jar
-%{_javadir}/jakarta-commons-httpclient.jar
+%{_javadir}/%{name}3.jar
+%{_javadir}/%{short_name}3.jar
+%{_javadir}/%{short_name}.jar
+%{_javadir}/jakarta-%{short_name}3.jar
+%{_javadir}/jakarta-%{short_name}.jar
+%{_mavenpomdir}/*
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml*
+%endif
%files javadoc
%defattr(0644,root,root,0755)
++++++ commons-httpclient-3.1.pom ++++++
<?xml version="1.0" encoding="UTF-8"?><project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<name>HttpClient</name>
<version>3.1</version>
<description>The HttpClient component supports the client-side of RFC 1945
(HTTP/1.0) and RFC 2616 (HTTP/1.1) , several related specifications (RFC 2109
(Cookies) , RFC 2617 (HTTP Authentication) , etc.), and provides a framework by
which new request types (methods) or HTTP extensions can be created
easily.</description>
<url>http://jakarta.apache.org/httpcomponents/httpclient-3.x/</url>
<issueManagement>
<url>http://issues.apache.org/jira/browse/HTTPCLIENT</url>
</issueManagement>
<ciManagement>
<notifiers>
<notifier>
<configuration>
<address>[email protected]</address>
</configuration>
</notifier>
</notifiers>
</ciManagement>
<inceptionYear>2001</inceptionYear>
<mailingLists>
<mailingList>
<name>HttpComponents Developer List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-httpcomponents-dev/</archive>
</mailingList>
<mailingList>
<name>HttpClient User List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-httpclient-user/</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>mbecke</id>
<name>Michael Becke</name>
<email>mbecke -at- apache.org</email>
<organization></organization>
<roles>
<role>Release Prime</role>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>jsdever</id>
<name>Jeff Dever</name>
<email>jsdever -at- apache.org</email>
<organization>Independent consultant</organization>
<roles>
<role>2.0 Release Prime</role>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>dion</id>
<name>dIon Gillard</name>
<email>dion -at- apache.org</email>
<organization>Multitask Consulting</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>oglueck</id>
<name>Ortwin Glueck</name>
<email>oglueck -at- apache.org</email>
<url>http://www.odi.ch/</url>
<organization></organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>jericho</id>
<name>Sung-Gu</name>
<email>jericho -at- apache.org</email>
<organization></organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>olegk</id>
<name>Oleg Kalnichevski</name>
<email>olegk -at- apache.org</email>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>sullis</id>
<name>Sean C. Sullivan</name>
<email>sullis -at- apache.org</email>
<organization>Independent consultant</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>adrian</id>
<name>Adrian Sutton</name>
<email>adrian.sutton -at- ephox.com</email>
<organization>Intencha</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>rwaldhoff</id>
<name>Rodney Waldhoff</name>
<email>rwaldhoff -at- apache</email>
<organization>Britannica</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
</developers>
<contributors>
<contributor>
<name>Armando Anton</name>
<email>armando.anton -at- newknow.com</email>
</contributor>
<contributor>
<name>Sebastian Bazley</name>
<email>sebb -at- apache.org</email>
</contributor>
<contributor>
<name>Ola Berg</name>
<email></email>
</contributor>
<contributor>
<name>Sam Berlin</name>
<email>sberlin -at- limepeer.com</email>
</contributor>
<contributor>
<name>Mike Bowler</name>
<email></email>
</contributor>
<contributor>
<name>Samit Jain</name>
<email>jain.samit -at- gmail.com</email>
</contributor>
<contributor>
<name>Eric Johnson</name>
<email>eric -at- tibco.com</email>
</contributor>
<contributor>
<name>Christian Kohlschuetter</name>
<email>ck -at- newsclub.de</email>
</contributor>
<contributor>
<name>Ryan Lubke</name>
<email>Ryan.Lubke -at- Sun.COM</email>
</contributor>
<contributor>
<name>Sam Maloney</name>
<email>sam.maloney -at- filogix.com</email>
</contributor>
<contributor>
<name>Rob Di Marco</name>
<email>rdimarco -at- hmsonline.com</email>
</contributor>
<contributor>
<name>Juergen Pill</name>
<email>Juergen.Pill -at- softwareag.com</email>
</contributor>
<contributor>
<name>Mohammad Rezaei</name>
<email>mohammad.rezaei -at- gs.com</email>
</contributor>
<contributor>
<name>Roland Weber</name>
<email>rolandw -at- apache.org</email>
</contributor>
<contributor>
<name>Laura Werner</name>
<email>laura -at- lwerner.org</email>
</contributor>
<contributor>
<name>Mikael Wilstrom</name>
<email>mikael.wikstrom -at- it.su.se</email>
</contributor>
</contributors>
<licenses>
<license>
<name>Apache License</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/httpcomponents/oac.hc3x/trunk</connection>
<url>http://svn.apache.org/repos/asf/jakarta/httpcomponents/oac.hc3x/trunk</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
</organization>
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<resources>
<resource>
<directory>src/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test</directory>
<includes>
<include>**/*.keystore</include>
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/TestAll.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
<distributionManagement>
<site>
<id>default</id>
<name>Default Site</name>
<url>scp://people.apache.org//www/jakarta.apache.org/httpcomponents/httpclient-3.x/</url>
</site>
<status>converted</status>
</distributionManagement>
</project>
