pool/tomcat
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1111848 from home:fstrba:branches:Java:packages

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1111848
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=270
This commit is contained in:
Fridrich Strba 2023-09-18 06:12:05 +00:00 committed by Git OBS Bridge
parent 2d2bb753f4
commit 1d620875c8
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,14 +12,13 @@
</path>
<path id="tomcat.classpath">
@@ -3845,6 +3845,13 @@
@@ -3845,6 +3845,12 @@
<!-- Add bnd tasks to project -->
<path id="bnd.classpath">
<fileset file="${bnd.jar}" />
+ <fileset file="${bndant.jar}" />
+ <fileset file="${bndlib.jar}" />
+ <fileset file="${bndlibg.jar}" />
+ <fileset file="${bndannotation.jar}" />
+ <fileset dir="${bnd.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset file="${osgiannotation.jar}" />
+ <fileset file="${osgicmpn.jar}" />
+ <fileset file="${slf4j-api.jar}" />

9
tomcat.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Sep 18 06:03:34 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* tomcat-9.0-osgi-build.patch
+ make it more robust to change in number of artifacts in bnd
+ do not enumerate jars, just take all jars from the aqute-bnd
directory into the classpath
-------------------------------------------------------------------
Tue Sep 12 11:30:29 UTC 2023 - Fridrich Strba <fstrba@suse.com>

5
tomcat.spec
View File

@ -291,10 +291,7 @@ ant -Dbase.path="." \
-Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \
-Dsaaj-api.jar="$(build-classpath geronimo-saaj-1.1-api)" \
-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)" \
-Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \
-Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
-Dbnd.dir="%{_javadir}/aqute-bnd" \
-Dosgiannotation.jar="$(build-classpath osgi-annotation/osgi.annotation)" \
-Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
-Dosgicmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \