File tomcat-9.0-disable-osgi-build.patch of Package tomcat.15818

Index: apache-tomcat-9.0.36-src/build.xml
===================================================================
--- apache-tomcat-9.0.36-src.orig/build.xml
+++ apache-tomcat-9.0.36-src/build.xml
@@ -648,7 +648,6 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            target="${compile.target}"
-           release="${compile.release}"
            encoding="ISO-8859-1"
            includeAntRuntime="true" >
       <!-- Uncomment this to show unchecked warnings:
@@ -754,7 +753,7 @@
   </target>
 
   <target name="build-bnd" unless="bnd.uptodate"
-          depends="setup-bnd,build-prepare">
+          depends="setup-bnd,build-prepare" if="add.osgi.jar.metadata">
 
     <mkdir dir="${tomcat.bnd}" />
     <copy todir="${tomcat.bnd}" overwrite="yes" filtering="yes"
@@ -1230,7 +1229,6 @@
              debug="${compile.debug}" deprecation="${compile.deprecation}"
              source="${compile.source}"
              target="${compile.target}"
-             release="${compile.release}"
              classpath="${tomcat.classes}"
              encoding="ISO-8859-1"
              includeantruntime="false">
@@ -1242,7 +1240,6 @@
              debug="${compile.debug}" deprecation="${compile.deprecation}"
              source="${compile.source}"
              target="${compile.target}"
-             release="${compile.release}"
              classpath="${tomcat.classes}"
              encoding="ISO-8859-1"
              includeantruntime="false">
@@ -1490,7 +1487,6 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            target="${compile.target}"
-           release="${compile.release}"
            encoding="ISO-8859-1"
            includeantruntime="true">
       <classpath refid="tomcat.test.classpath" />
@@ -3299,7 +3295,7 @@ Read the Building page on the Apache Tom
 
   <!-- ======================= Macros, Taskdefs etc ======================== -->
 
-  <target name="download-bnd" >
+  <target name="download-bnd" if="add.osgi.jar.metadata">
     <!-- Download bnd -->
     <antcall target="downloadfile">
       <param name="sourcefile" value="${bnd.loc}"/>
@@ -3321,7 +3317,7 @@ Read the Building page on the Apache Tom
     </antcall>
   </target>
 
-  <target name="setup-bnd" depends="download-bnd">
+  <target name="setup-bnd" depends="download-bnd" if="add.osgi.jar.metadata">
     <!-- Add bnd tasks to project -->
     <path id="bndlib.classpath">
       <fileset file="${bnd.jar}" />
@@ -3367,7 +3363,7 @@ Read the Building page on the Apache Tom
         <zipfileset file="@{notice}" fullpath="META-INF/NOTICE" />
         <zipfileset file="@{license}" fullpath="META-INF/LICENSE" />
       </jar>
-      <antcall target="add-osgi" >
+      <antcall target="add-osgi" if:set="add.osgi.jar.metadata">
         <param name="jarfile" value="@{jarfile}" />
         <param name="addOSGi" value="@{addOSGi}" />
       </antcall>