Accepting request 755693 from Java:packages

Fix build with new rpm

OBS-URL: https://build.opensuse.org/request/show/755693
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geronimo-specs?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger 2019-12-23 21:35:55 +00:00 committed by Git OBS Bridge
commit 7ac9adb3dc
2 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 10 23:10:17 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Set version for the specs comming from tag 1_1_1 in order to
avoid unexpanded version macros in pom files.
-------------------------------------------------------------------
Mon Apr 15 13:02:26 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package geronimo-specs
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -684,6 +684,11 @@ for i in */pom.xml; do
%pom_xpath_inject "pom:project" "<groupId>org.apache.geronimo.specs</groupId>" ${i}
done
%pom_add_dep logkit:logkit:1.2.2 geronimo-spec-corba-2.3
%pom_xpath_set pom:project/pom:version 1.0 geronimo-spec-commonj
%pom_xpath_set pom:project/pom:version 1.0 geronimo-spec-corba
%pom_xpath_set pom:project/pom:version 1.1 geronimo-spec-corba-2.3
%pom_xpath_set pom:project/pom:version 1.1 geronimo-spec-corba-3.0
%pom_xpath_set pom:project/pom:version 1.1.1 geronimo-spec-j2ee
%build
ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 \