tomcat/tomcat-9.0-osgi-build.patch

37 lines
1.1 KiB
Diff

--- apache-tomcat-9.0.91-src/build.xml 2024-07-08 18:21:26.161496515 +0200
+++ apache-tomcat-9.0.91-src/build.xml 2024-07-08 18:30:43.722334075 +0200
@@ -226,11 +226,21 @@
<!--<defaultexcludes echo="true" />-->
<!-- 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">
- <pathelement location="${bnd.jar}"/>
<pathelement location="${jdt.jar}"/>
<pathelement location="${jaxrpc-lib.jar}"/>
<pathelement location="${wsdl4j-lib.jar}"/>
+ <path refid="bnd.classpath"/>
</path>
<path id="tomcat.classpath">
@@ -3960,10 +3970,6 @@
<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" />
</target>