1
0
forked from pool/avalon-logkit

Accepting request 694539 from Java:packages

Fix build against upcoming geronimo-specs

OBS-URL: https://build.opensuse.org/request/show/694539
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avalon-logkit?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2019-04-18 11:54:20 +00:00 committed by Git OBS Bridge
commit 7e8bddd337
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 15 13:44:10 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Depend directly on the geronimo-jms-1_1-api package instead of
the jms virtual provider
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 14 18:07:00 UTC 2019 - Fridrich Strba <fstrba@suse.com> Thu Feb 14 18:07:00 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -37,12 +37,12 @@ Patch3: fix-java7-compile.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: geronimo-jms-1_1-api
BuildRequires: glassfish-servlet-api BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javamail BuildRequires: javamail
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: jdbc-stdext BuildRequires: jdbc-stdext
BuildRequires: jms
BuildRequires: log4j BuildRequires: log4j
BuildRequires: unzip BuildRequires: unzip
Requires: mvn(javax.jms:jms) Requires: mvn(javax.jms:jms)
@ -79,7 +79,7 @@ mkdir -p target/lib
build-jar-repository -s -p target/lib \ build-jar-repository -s -p target/lib \
log4j \ log4j \
javamail/mailapi \ javamail/mailapi \
jms_api \ geronimo-jms-1.1-api \
glassfish-servlet-api glassfish-servlet-api
ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 \