From f894a4a138fe6242af4d3b5d5b09c2df7fa6d2bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 26 Jul 2015 22:22:18 +0300 Subject: [PATCH] jdk hack not needed with java-eclipse-jdt 4.4.2 --- jdt18.patch | 25 ------------------------- tomcat.spec | 4 +--- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 jdt18.patch diff --git a/jdt18.patch b/jdt18.patch deleted file mode 100644 index 0a68e81..0000000 --- a/jdt18.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bz.apache.org/bugzilla/show_bug.cgi?id=56373 - ---- java/org/apache/jasper/compiler/JDTCompiler.java (revision 1585931) -+++ java/org/apache/jasper/compiler/JDTCompiler.java (working copy) -@@ -335,7 +335,7 @@ - CompilerOptions.VERSION_1_7); - } else if(opt.equals("1.8")) { - settings.put(CompilerOptions.OPTION_Source, -- CompilerOptions.VERSION_1_8); -+ "1.8"); // CompilerOptions.VERSION_1_8 - } else { - log.warn("Unknown source VM " + opt + " ignored."); - settings.put(CompilerOptions.OPTION_Source, -@@ -379,9 +379,9 @@ - CompilerOptions.VERSION_1_7); - } else if(opt.equals("1.8")) { - settings.put(CompilerOptions.OPTION_TargetPlatform, -- CompilerOptions.VERSION_1_8); -+ "1.8"); // CompilerOptions.VERSION_1_8 - settings.put(CompilerOptions.OPTION_Compliance, -- CompilerOptions.VERSION_1_8); -+ "1.8"); // CompilerOptions.VERSION_1_8 - } else { - log.warn("Unknown target VM " + opt + " ignored."); - settings.put(CompilerOptions.OPTION_TargetPlatform, diff --git a/tomcat.spec b/tomcat.spec index 2456ea4..bde36dd 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -39,7 +39,6 @@ Patch2: %{name}-LDAPUserDatabase.patch Patch3: %{name}-catalina.policy-javadir.patch Patch4: %{name}-userdir.patch Patch5: logging.patch -Patch6: jdt18.patch Patch100: jcl-build.xml.patch URL: http://tomcat.apache.org/ BuildRequires: ant >= 1.5.3 @@ -49,7 +48,7 @@ BuildRequires: java-avalon-logkit BuildRequires: java-commons-daemon >= 1.0 BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1 BuildRequires: java-commons-pool-tomcat5 -BuildRequires: java-eclipse-jdt >= 4.3.1 +BuildRequires: java-eclipse-jdt >= 4.4.2 BuildRequires: java-geronimo-spec-jaxrpc BuildRequires: java-jdbc-mysql BuildRequires: java-junit @@ -268,7 +267,6 @@ javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext). %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p0 # Prepare java-commmons-logging sources install -d output/extras/logging -- 2.44.0