Accepting request 689046 from Java:packages

Disregard the pom parent

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 25 17:39:46 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove pom parent, since we don't use it when not building with
maven
-------------------------------------------------------------------
Sat Dec 15 14:17:20 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package apache-commons-dbcp
#
# 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
@ -32,7 +32,6 @@ Patch0: apache-commons-dbcp-sourcetarget.patch
Patch1: apache-commons-dbcp-javadoc.patch
BuildRequires: ant >= 1.6.5
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-parent
BuildRequires: apache-commons-pool2
BuildRequires: fdupes
BuildRequires: geronimo-jta-1_1-api
@ -41,7 +40,6 @@ BuildRequires: javapackages-local
BuildRequires: jdbc-stdext >= 2.0
BuildRequires: junit >= 3.8.1
BuildRequires: xerces-j2
Requires: apache-commons-parent
Requires: commons-collections >= 3.2
Requires: commons-pool2
Requires: jta_api >= 1.1
@ -85,6 +83,8 @@ features.
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
%pom_remove_parent .
%build
ant \
-Dcommons-pool.jar=$(build-classpath commons-pool2) \