From f532ac54d0359c0157535407d7d84fe76bc29953 Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl@redhat.com>
Date: Tue, 12 Jun 2018 15:48:54 -0400
Subject: [PATCH] ECJ seems to be going away and the FreeIPA folks say they
 don't need it, so removing it here

---
 pki-servlet-container.spec | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pki-servlet-container.spec b/pki-servlet-container.spec
index ef27220..26d3053 100644
--- a/pki-servlet-container.spec
+++ b/pki-servlet-container.spec
@@ -92,7 +92,6 @@ Patch3:        disableJavadocFailOnWarning.patch
 BuildArch:     noarch
 
 BuildRequires: ant
-BuildRequires: ecj >= 1:4.6.3
 BuildRequires: findutils
 BuildRequires: java-devel >= 1:1.8.0
 BuildRequires: jpackage-utils >= 0:1.7.0
@@ -124,7 +123,6 @@ Provides: jsp = %{jspspec}
 Obsoletes: tomcat-jsp-2.2-api
 
 #%%package lib
-Requires: ecj >= 1:4.6.3
 Requires(preun): coreutils
 
 #%%package el-%%{elspec}-api
@@ -168,6 +166,9 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch2 -p0
 #%%patch3 -p0
 
+# Since we don't support ECJ in RHEL anymore, remove the class that requires it
+%{__rm} -f java/org/apache/jasper/compiler/JDTCompiler.java
+
 %build
 export OPT_JAR_LIST="xalan-j2-serializer"
    # Create a dummy file for later removal
@@ -178,7 +179,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
       -Dbuild.compiler="modern" \
       -Dcommons-daemon.jar="HACK" \
       -Dcommons-daemon.native.src.tgz="HACK" \
-      -Djdt.jar="$(build-classpath ecj)" \
+      -Djdt.jar="HACK" \
       -Dtomcat-native.tar.gz="HACK" \
       -Dtomcat-native.home="." \
       -Dcommons-daemon.native.win.mgr.exe="HACK" \
@@ -187,8 +188,8 @@ export OPT_JAR_LIST="xalan-j2-serializer"
       -Dversion.build="%{micro_version}" \
       deploy dist-prepare dist-source
 
-    # remove some jars that we'll replace with symlinks later
-    %{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar
+    # remove some jars that we don't need
+    %{__rm} output/build/bin/commons-daemon.jar
 
 # inject OSGi manifests
 mkdir -p META-INF
@@ -291,16 +292,11 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}
    %{__ln_s} tomcat-el-%{elspec}-api.jar tomcat-el-api.jar
 popd
 
-pushd output/build
-    %{_bindir}/build-jar-repository lib ecj 2>&1
-popd
-
 pushd ${RPM_BUILD_ROOT}%{libdir}
     # symlink JSP and servlet API jars
     %{__ln_s} ../../java/tomcat-jsp-%{jspspec}-api.jar .
     %{__ln_s} ../../java/tomcat-servlet-%{servletspec}-api.jar .
     %{__ln_s} ../../java/tomcat-el-%{elspec}-api.jar .
-    %{__ln_s} $(build-classpath ecj) jasper-jdt.jar
 
     # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap)
     %{__cp} -a ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./