diff --git a/tomcat-9.0-osgi-build.patch b/tomcat-9.0-osgi-build.patch index 0fec32a..1f2826c 100644 --- a/tomcat-9.0-osgi-build.patch +++ b/tomcat-9.0-osgi-build.patch @@ -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/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 ++ + + + diff --git a/tomcat.changes b/tomcat.changes index 73eac81..937bee9 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 10 06:51:24 UTC 2021 - Fridrich Strba + +- 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 diff --git a/tomcat.spec b/tomcat.spec index ed72c74..81219fa 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -293,6 +293,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)" \