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=313

Browse Source
This commit is contained in:
Fridrich Strba 2024-07-08 16:41:40 +00:00 committed by Git OBS Bridge
parent 01c0bda548
commit aa1e924118
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,19 @@
--- apache-tomcat-9.0.75-src/build.xml 2023-05-22 18:12:16.995658642 +0200 --- apache-tomcat-9.0.91-src/build.xml 2024-07-08 18:21:26.161496515 +0200
+++ apache-tomcat-9.0.75-src/build.xml 2023-05-22 19:41:42.051370923 +0200 +++ apache-tomcat-9.0.91-src/build.xml 2024-07-08 18:30:43.722334075 +0200
@@ -215,10 +215,10 @@ @@ -226,11 +226,21 @@
<!--<defaultexcludes echo="true" />-->
<!-- Classpaths --> <!-- Classpaths -->
+ <path id="bnd.classpath">
+ <fileset file="${bnd.jar}" />
+ <fileset dir="${bnd.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset file="${osgiannotation.jar}" />
+ <fileset file="${osgicmpn.jar}" />
+ <fileset file="${slf4j-api.jar}" />
+ </path>
+
<path id="compile.classpath"> <path id="compile.classpath">
- <pathelement location="${bnd.jar}"/> - <pathelement location="${bnd.jar}"/>
<pathelement location="${jdt.jar}"/> <pathelement location="${jdt.jar}"/>
@ -12,16 +23,15 @@
</path> </path>
<path id="tomcat.classpath"> <path id="tomcat.classpath">
@@ -3845,6 +3845,12 @@ @@ -3960,10 +3970,6 @@
<!-- Add bnd tasks to project -->
<path id="bnd.classpath">
<fileset file="${bnd.jar}" />
+ <fileset dir="${bnd.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset file="${osgiannotation.jar}" />
+ <fileset file="${osgicmpn.jar}" />
+ <fileset file="${slf4j-api.jar}" />
</path>
<target name="setup-bnd" depends="download-bnd" unless="skip.build.java.version">
<!-- Add bnd tasks to project -->
- <path id="bnd.classpath">
- <fileset file="${bnd.jar}" />
- </path>
-
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" /> <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />
</target>
Only in apache-tomcat-9.0.91-src: build.xml.orig

8
tomcat.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jul 8 16:34:38 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* tomcat-9.0-osgi-build.patch
+ move the definition of bnd.classpath out of the setup-bnd task
since it is one component in build.classpath
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 8 14:54:54 UTC 2024 - Ricardo Mestre <ricardo.mestre@suse.com> Mon Jul 8 14:54:54 UTC 2024 - Ricardo Mestre <ricardo.mestre@suse.com>