From a4d83da017ddcd95cf7d8740c6c8b77e5a107af6 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Fri, 9 Jul 2021 08:49:36 -0400 Subject: [PATCH] Related: rhbz#1977948 Cleanup unused tomcat-juli.jar copy now that the maven artifacts have been removed --- pki-servlet-engine.spec | 8 +- removeUnusedDependencies.patch | 427 --------------------------------- 2 files changed, 4 insertions(+), 431 deletions(-) delete mode 100644 removeUnusedDependencies.patch diff --git a/pki-servlet-engine.spec b/pki-servlet-engine.spec index e9bcf4a..ece1eee 100644 --- a/pki-servlet-engine.spec +++ b/pki-servlet-engine.spec @@ -58,7 +58,7 @@ Name: pki-servlet-engine Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons License: ASL 2.0 @@ -261,9 +261,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/tomcat-jsp-%{jspspec}-api.jar . %{__ln_s} ../../java/tomcat-servlet-%{servletspec}-api.jar . %{__ln_s} ../../java/tomcat-el-%{elspec}-api.jar . - - # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap) - %{__cp} -a ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./ popd # symlink to the FHS locations where we've installed things @@ -387,6 +384,9 @@ fi %{_javadir}/tomcat-servlet-%{servletspec}*.jar %changelog +* Fri Jul 09 2021 Coty Sutherland - 1:9.0.43-2 +- Related: rhbz#1977948 Cleanup unused tomcat-juli.jar copy now that the maven artifacts have been removed + * Thu Jul 08 2021 Coty Sutherland - 1:9.0.43-1 - Update to JWS 5.5, and drop jakarta-saaj dependency - Updates to javapackages-local removed %%add_maven_depmap which broke the build, diff --git a/removeUnusedDependencies.patch b/removeUnusedDependencies.patch deleted file mode 100644 index 2485940..0000000 --- a/removeUnusedDependencies.patch +++ /dev/null @@ -1,427 +0,0 @@ -diff -up ./build.properties.default.orig ./build.properties.default ---- ./build.properties.default.orig 2020-04-23 09:43:55.567688581 -0400 -+++ ./build.properties.default 2020-04-23 09:57:55.724988090 -0400 -@@ -274,35 +274,3 @@ findbugs.checksum.value=8c54502a8e1b78ea - findbugs.home=${base.path}/spotbugs-${findbugs.version} - findbugs.jar=${findbugs.home}/lib/spotbugs-ant.jar - findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/spotbugs-${findbugs.version}.tgz -- --# ----- SAAJ API, used by Code Signing for releases ----- --# ----- No longer part of JRE from Java 11 onwards ----- --# ----- CDDL Licensed ----- --saaj-api.version=1.3.5 --saaj-api.checksum.enabled=true --saaj-api.checksum.algorithm=MD5|SHA-1 --saaj-api.checksum.value=caae8b4bf2c551155815331e9e96256f|1c399a7fea4d0262a6a39750e419c24f0c769586 --saaj-api.home=${base.path}/saaj-api-${saaj-api.version} --saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar --saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar -- --# ----- bnd & bndlib, version 4.0.0 or later ----- --# ----- provides OSGI metadata for JARs ----- --bnd.version=4.2.0 -- --# checksums for biz.aQute.bnd-4.2.0.jar, biz.aQute.bndlib-4.2.0.jar --bnd.checksum.enabled=true --bnd.checksum.algorithm=MD5|SHA-1 --bnd.checksum.value=ca26a671ea67bf75d83b1588bdd68923|d4bc96b2619f95e596bbf3f725f3b077e96c5d43 -- --bndlib.checksum.enabled=true --bndlib.checksum.algorithm=MD5|SHA-1 --bndlib.checksum.value=7519e890783ade99bb74608d0efbf8c4|c4fa30ac11cc0bf27b1f706ac8ebae8cec358e77 -- --bnd.home=${base.path}/bnd-${bnd.version} --bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar --bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar -- --bndlib.home=${base.path}/bndlib-${bnd.version} --bndlib.jar=${bndlib.home}/biz.aQute.bndlib-${bnd.version}.jar --bndlib.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bndlib/${bnd.version}/biz.aQute.bndlib-${bnd.version}.jar -diff -up ./build.xml.orig ./build.xml ---- ./build.xml.orig 2020-04-23 09:43:50.041699701 -0400 -+++ ./build.xml 2020-04-23 09:58:18.835941004 -0400 -@@ -69,7 +69,6 @@ - - - -- - - - -@@ -219,9 +218,6 @@ - - - -- -- -- - - - -@@ -272,7 +268,6 @@ - - - -- - - - -@@ -425,6 +420,7 @@ - - - -+ - - - -@@ -556,18 +552,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- - - - - - -+ - - - -@@ -755,25 +740,12 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -+ - - -+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - - -+ license="${tomcat.manifests}/servlet-api.jar.license" /> - - - -+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> - - - -+ manifest="${tomcat.manifests}/el-api.jar.manifest" /> - - - -+ manifest="${tomcat.manifests}/websocket-api.jar.manifest" /> - - - -+ manifest="${tomcat.manifests}/jaspic-api.jar.manifest" /> - - - -+ meta-inf="${tomcat.manifests}/tomcat-websocket.jar" /> - - - - -+ filesId="files.tomcat-juli" /> - - - -+ filesId="files.catalina" /> - - - -+ filesId="files.catalina-tribes" /> - - - -+ filesId="files.catalina-ssi" /> - - - -+ filesId="files.catalina-ha" /> - - - - -+ filesId="files.catalina-storeconfig" /> - - - -+ filesId="files.tomcat-api" /> - - - -+ filesId="files.tomcat-util" /> - - - -+ filesId="files.tomcat-util-scan" /> - - - -+ filesId="files.tomcat-coyote" /> - - -+ filesId="files.tomcat-jni" /> - - - -+ meta-inf="${tomcat.manifests}/jasper.jar" /> - - - -+ filesId="files.jasper-el" /> - - - -+ filesId="files.tomcat-dbcp" /> - - - - - -+ depends="build-manifests,compile" > - - - -@@ -1387,22 +1339,18 @@ - filesDir="${tomcat.classes}" - filesId="files.tomcat-embed-core" - notice="${tomcat.manifests}/servlet-api.jar.notice" -- license="${tomcat.manifests}/servlet-api.jar.license" -- addOSGi="true" /> -+ license="${tomcat.manifests}/servlet-api.jar.license" /> - -+ meta-inf="${tomcat.manifests}/jasper.jar" /> - -+ filesId="files.tomcat-embed-el" /> - -+ meta-inf="${tomcat.manifests}/tomcat-websocket.jar" /> - - - -@@ -2749,34 +2697,6 @@ skip.installer property in build.propert - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -3261,38 +3181,6 @@ Read the Building page on the Apache Tom - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - -@@ -3308,8 +3196,6 @@ Read the Building page on the Apache Tom - default="${tomcat.manifests}/default.license" /> - -- - - - -@@ -3323,22 +3209,9 @@ Read the Building page on the Apache Tom - - - -- -- -- -- - - - -- -- -- -- -- -- -- -- -- - - -