Accepting request 689054 from Java:packages

Disregard the pom parent

OBS-URL: https://build.opensuse.org/request/show/689054
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-pool2?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2019-03-28 21:45:30 +00:00 committed by Git OBS Bridge
commit 2ab0a27f77
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 25 17:47:40 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove pom parent, since we don't use it when not building with
maven
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 13 11:27:43 UTC 2018 - Fridrich Strba <fstrba@suse.com> Thu Dec 13 11:27:43 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-pool2 # spec file for package apache-commons-pool2
# #
# 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,6 @@ URL: https://commons.apache.org/proper/commons-pool/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Patch0: jakarta-commons-pool-build.patch Patch0: jakarta-commons-pool-build.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-parent
BuildRequires: cglib BuildRequires: cglib
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
@ -65,6 +64,9 @@ Pool 2.x Package.
find . -name "*.jar" -exec rm -f {} \; find . -name "*.jar" -exec rm -f {} \;
%patch0 %patch0
%pom_remove_parent .
%pom_xpath_inject "pom:project" "<groupId>org.apache.commons</groupId>" .
%build %build
echo "cglib.jar=$(build-classpath cglib)" >> build.properties echo "cglib.jar=$(build-classpath cglib)" >> build.properties
ant \ ant \