Fridrich Strba 2024-01-17 16:47:26 +00:00 committed by Git OBS Bridge
parent 9c6b265e44
commit eec71fc139
2 changed files with 22 additions and 0 deletions

21
java8.patch Normal file
View File

@ -0,0 +1,21 @@
diff -urEbwB apache-tomcat-9.0.85-src.orig/build.xml apache-tomcat-9.0.85-src/build.xml
--- apache-tomcat-9.0.85-src.orig/build.xml 2024-01-17 16:38:45.550245596 +0100
+++ apache-tomcat-9.0.85-src/build.xml 2024-01-17 16:39:27.487195879 +0100
@@ -107,17 +107,6 @@
<!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
<property name="compile.release" value="8"/>
<property name="min.java.version" value="8"/>
- <property name="build.java.version" value="17"/>
-
- <!-- Check Java Build Version -->
- <fail message="Java version ${build.java.version} or newer is required (${java.version} is installed)">
- <condition>
- <and>
- <not><javaversion atleast="${build.java.version}" /></not>
- <not><isset property="skip.build.java.version"/></not>
- </and>
- </condition>
- </fail>
<!-- Locations to create the JAR artifacts -->
<!-- Standard JARs -->

View File

@ -82,6 +82,7 @@ Patch5: %{name}-%{major_version}.%{minor_version}-jdt.patch
Patch6: tomcat-9.0.75-secretRequired-default.patch
Patch7: tomcat-9.0-fix_catalina.patch
Patch8: tomcat-9.0-logrotate_everything.patch
Patch9: java8.patch
BuildRequires: ant >= 1.8.1
BuildRequires: ant-antlr
BuildRequires: apache-commons-collections