tomcat10/tomcat-osgi-build.patch

32 lines
1.1 KiB
Diff

Index: apache-tomcat-10.1.5-src/build.xml
===================================================================
--- apache-tomcat-10.1.5-src.orig/build.xml
+++ apache-tomcat-10.1.5-src/build.xml
@@ -217,11 +217,11 @@
<!-- Classpaths -->
<path id="compile.classpath">
- <pathelement location="${bnd.jar}"/>
<pathelement location="${jdt.jar}"/>
<pathelement location="${jaxrpc-lib.jar}"/>
<pathelement location="${wsdl4j-lib.jar}"/>
<pathelement location="${migration-lib.jar}"/>
+ <path refid="bnd.classpath"/>
</path>
<path id="tomcat.classpath">
@@ -3884,6 +3884,13 @@ Read the Building page on the Apache Tom
<!-- 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="${osgicore.jar}" />
+ <fileset file="${slf4j-api.jar}" />
</path>
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />