rpm/tomcat
SHA256
1
0
Fork 0
forked from pool/tomcat
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=227

Browse Source
This commit is contained in:
Fridrich Strba 2021-11-10 06:56:56 +00:00 committed by Git OBS Bridge
parent e8a2685481
commit d7d5c718d0
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tomcat-9.0-osgi-build.patch
View File

@ -2,10 +2,11 @@ Index: apache-tomcat-9.0.37-src/build.xml
=================================================================== ===================================================================
--- apache-tomcat-9.0.37-src.orig/build.xml --- apache-tomcat-9.0.37-src.orig/build.xml
+++ apache-tomcat-9.0.37-src/build.xml +++ apache-tomcat-9.0.37-src/build.xml
@@ -3307,6 +3307,12 @@ Read the Building page on the Apache Tom @@ -3307,6 +3307,13 @@ Read the Building page on the Apache Tom
<!-- Add bnd tasks to project --> <!-- Add bnd tasks to project -->
<path id="bnd.classpath"> <path id="bnd.classpath">
<fileset file="${bnd.jar}" /> <fileset file="${bnd.jar}" />
+ <fileset file="${bndant.jar}" />
+ <fileset file="${bndlib.jar}" /> + <fileset file="${bndlib.jar}" />
+ <fileset file="${bndlibg.jar}" /> + <fileset file="${bndlibg.jar}" />
+ <fileset file="${bndannotation.jar}" /> + <fileset file="${bndannotation.jar}" />

7
tomcat.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 10 06:51:24 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* tomcat-9.0-osgi-build.patch
+ account for biz.aQute.bnd.ant artifact in aqute-bnd >= 5.2.0
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 18 21:42:48 UTC 2021 - Marcel Witte <wittemar@googlemail.com> Mon Oct 18 21:42:48 UTC 2021 - Marcel Witte <wittemar@googlemail.com>

1
tomcat.spec
View File

@ -293,6 +293,7 @@ ant -Dbase.path="." \
-Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \
-Dsaaj-api.jar="$(build-classpath geronimo-saaj-1.1-api)" \ -Dsaaj-api.jar="$(build-classpath geronimo-saaj-1.1-api)" \
-Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \
-Dbndant.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.ant)" \
-Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \
-Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \
-Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \