diff --git a/.gitignore b/.gitignore
index 0a924a0..d62dbc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/apache-tomcat-9.0.62-src.tar.gz
+SOURCES/tomcat-9.0.62.redhat-00014-src.zip
diff --git a/.tomcat.metadata b/.tomcat.metadata
index 518df04..decd06a 100644
--- a/.tomcat.metadata
+++ b/.tomcat.metadata
@@ -1 +1 @@
-c7256fcf1c253b5f291cc4754ca26ad6e9e8b268 SOURCES/apache-tomcat-9.0.62-src.tar.gz
+a0b455b96e12c6eb6410a2dae201bf25b0edb8ed SOURCES/tomcat-9.0.62.redhat-00014-src.zip
diff --git a/SOURCES/JmxRemoteLifecycleListener.patch b/SOURCES/JmxRemoteLifecycleListener.patch
new file mode 100644
index 0000000..3145a54
--- /dev/null
+++ b/SOURCES/JmxRemoteLifecycleListener.patch
@@ -0,0 +1,40 @@
+diff --git a/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java b/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
+index f62f8d1..db19960 100644
+--- a/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
++++ b/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
+@@ -611,34 +611,28 @@ public class JmxRemoteLifecycleListener extends SSLHostConfig implements Lifecyc
+ * Better to use the internal API than re-invent the wheel.
+ */
+ @SuppressWarnings("restriction")
+- private static class JmxRegistry extends sun.rmi.registry.RegistryImpl {
++ private static class JmxRegistry {
+ private static final long serialVersionUID = -3772054804656428217L;
+ private final String jmxName;
+ private final Remote jmxServer;
+ public JmxRegistry(int port, RMIClientSocketFactory csf,
+ RMIServerSocketFactory ssf, String jmxName, Remote jmxServer) throws RemoteException {
+- super(port, csf, ssf);
+ this.jmxName = jmxName;
+ this.jmxServer = jmxServer;
+ }
+- @Override
+ public Remote lookup(String name)
+ throws RemoteException, NotBoundException {
+ return (jmxName.equals(name)) ? jmxServer : null;
+ }
+- @Override
+ public void bind(String name, Remote obj)
+ throws RemoteException, AlreadyBoundException, AccessException {
+ }
+- @Override
+ public void unbind(String name)
+ throws RemoteException, NotBoundException, AccessException {
+ }
+- @Override
+ public void rebind(String name, Remote obj)
+ throws RemoteException, AccessException {
+ }
+- @Override
+ public String[] list() throws RemoteException {
+ return new String[] { jmxName };
+ }
diff --git a/SOURCES/tomcat-9.0-JDTCompiler.patch b/SOURCES/tomcat-9.0-JDTCompiler.patch
deleted file mode 100644
index edf156a..0000000
--- a/SOURCES/tomcat-9.0-JDTCompiler.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java ./java/org/apache/jasper/compiler/JDTCompiler.java
-index 2e361f2..277d8f4 100644
---- java/org/apache/jasper/compiler/JDTCompiler.java
-+++ java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -310,7 +310,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
- } else if(opt.equals("15")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
- } else if(opt.equals("16")) {
-- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
-+ settings.put(CompilerOptions.OPTION_Source, "16");
- } else if(opt.equals("17")) {
- // Constant not available in latest ECJ version that runs on
- // Java 8.
-@@ -377,8 +377,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
- } else if(opt.equals("16")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
-- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
-+ settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
-+ settings.put(CompilerOptions.OPTION_Compliance, "16");
- } else if(opt.equals("17")) {
- // Constant not available in latest ECJ version that runs on
- // Java 8.
diff --git a/SOURCES/tomcat-9.0-memory-leak.patch b/SOURCES/tomcat-9.0-memory-leak.patch
deleted file mode 100644
index 00e6e56..0000000
--- a/SOURCES/tomcat-9.0-memory-leak.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
-index 8746b6b..dc878c6 100644
---- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
-+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
-@@ -1820,41 +1820,13 @@ public abstract class WebappClassLoaderBase extends URLClassLoader
- // shutting down the executor
- boolean usingExecutor = false;
- try {
--
-- // Runnable wrapped by Thread
-- // "target" in Sun/Oracle JDK
-- // "runnable" in IBM JDK
-- // "action" in Apache Harmony
-- Object target = null;
-- for (String fieldName : new String[] { "target", "runnable", "action" }) {
-- try {
-- Field targetField = thread.getClass().getDeclaredField(fieldName);
-- targetField.setAccessible(true);
-- target = targetField.get(thread);
-- break;
-- } catch (NoSuchFieldException nfe) {
-- continue;
-- }
-- }
--
-- // "java.util.concurrent" code is in public domain,
-- // so all implementations are similar including our
-- // internal fork.
-- if (target != null && target.getClass().getCanonicalName() != null &&
-- (target.getClass().getCanonicalName().equals(
-- "org.apache.tomcat.util.threads.ThreadPoolExecutor.Worker") ||
-- target.getClass().getCanonicalName().equals(
-- "java.util.concurrent.ThreadPoolExecutor.Worker"))) {
-- Field executorField = target.getClass().getDeclaredField("this$0");
-- executorField.setAccessible(true);
-- Object executor = executorField.get(target);
-- if (executor instanceof ThreadPoolExecutor) {
-- ((ThreadPoolExecutor) executor).shutdownNow();
-- usingExecutor = true;
-- } else if (executor instanceof java.util.concurrent.ThreadPoolExecutor) {
-- ((java.util.concurrent.ThreadPoolExecutor) executor).shutdownNow();
-- usingExecutor = true;
-- }
-+ Object executor = JreCompat.getInstance().getExecutor(thread);
-+ if (executor instanceof ThreadPoolExecutor) {
-+ ((ThreadPoolExecutor) executor).shutdownNow();
-+ usingExecutor = true;
-+ } else if (executor instanceof java.util.concurrent.ThreadPoolExecutor) {
-+ ((java.util.concurrent.ThreadPoolExecutor) executor).shutdownNow();
-+ usingExecutor = true;
- }
- } catch (NoSuchFieldException | IllegalAccessException | RuntimeException e) {
- // InaccessibleObjectException is only available in Java 9+,
-@@ -2306,6 +2278,12 @@ public abstract class WebappClassLoaderBase extends URLClassLoader
-
-
- private void clearReferencesObjectStreamClassCaches() {
-+ if (JreCompat.isJre19Available()) {
-+ // The memory leak this fixes has been fixed in Java 19 onwards,
-+ // 17.0.4 onwards and 11.0.16 onwards
-+ // See https://bugs.openjdk.java.net/browse/JDK-8277072
-+ return;
-+ }
- try {
- Class clazz = Class.forName("java.io.ObjectStreamClass$Caches");
- clearCache(clazz, "localDescs");
-@@ -2333,14 +2311,19 @@ public abstract class WebappClassLoaderBase extends URLClassLoader
- throws ReflectiveOperationException, SecurityException, ClassCastException {
- Field f = target.getDeclaredField(mapName);
- f.setAccessible(true);
-- Map map = (Map) f.get(null);
-- Iterator keys = map.keySet().iterator();
-- while (keys.hasNext()) {
-- Object key = keys.next();
-- if (key instanceof Reference) {
-- Object clazz = ((Reference) key).get();
-- if (loadedByThisOrChild(clazz)) {
-- keys.remove();
-+ Object map = f.get(null);
-+ // Avoid trying to clear references if Tomcat is running on a JRE that
-+ // includes the fix for this memory leak
-+ // See https://bugs.openjdk.java.net/browse/JDK-8277072
-+ if (map instanceof Map) {
-+ Iterator keys = ((Map) map).keySet().iterator();
-+ while (keys.hasNext()) {
-+ Object key = keys.next();
-+ if (key instanceof Reference) {
-+ Object clazz = ((Reference) key).get();
-+ if (loadedByThisOrChild(clazz)) {
-+ keys.remove();
-+ }
- }
- }
- }
-diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java b/java/org/apache/tomcat/util/compat/JreCompat.java
-index 62df145..e5df728 100644
---- a/java/org/apache/tomcat/util/compat/JreCompat.java
-+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
-@@ -19,6 +19,7 @@ package org.apache.tomcat.util.compat;
- import java.io.File;
- import java.io.IOException;
- import java.lang.reflect.AccessibleObject;
-+import java.lang.reflect.Field;
- import java.lang.reflect.InvocationTargetException;
- import java.lang.reflect.Method;
- import java.net.SocketAddress;
-@@ -45,6 +46,7 @@ public class JreCompat {
-
- private static final JreCompat instance;
- private static final boolean graalAvailable;
-+ private static final boolean jre19Available;
- private static final boolean jre16Available;
- private static final boolean jre11Available;
- private static final boolean jre9Available;
-@@ -67,18 +69,26 @@ public class JreCompat {
-
- // This is Tomcat 9 with a minimum Java version of Java 8.
- // Look for the highest supported JVM first
-- if (Jre16Compat.isSupported()) {
-+ if (Jre19Compat.isSupported()) {
-+ instance = new Jre19Compat();
-+ jre9Available = true;
-+ jre16Available = true;
-+ jre19Available = true;
-+ } else if (Jre16Compat.isSupported()) {
- instance = new Jre16Compat();
- jre9Available = true;
- jre16Available = true;
-+ jre19Available = false;
- } else if (Jre9Compat.isSupported()) {
- instance = new Jre9Compat();
- jre9Available = true;
- jre16Available = false;
-+ jre19Available = false;
- } else {
- instance = new JreCompat();
- jre9Available = false;
- jre16Available = false;
-+ jre19Available = false;
- }
- jre11Available = instance.jarFileRuntimeMajorVersion() >= 11;
-
-@@ -124,6 +134,9 @@ public class JreCompat {
- return jre16Available;
- }
-
-+ public static boolean isJre19Available() {
-+ return jre19Available;
-+ }
-
- // Java 8 implementation of Java 9 methods
-
-@@ -303,6 +316,8 @@ public class JreCompat {
- }
-
-
-+ // Java 8 implementations of Java 16 methods
-+
- /**
- * Return Unix domain socket address for given path.
- * @param path The path
-@@ -329,4 +344,63 @@ public class JreCompat {
- public SocketChannel openUnixDomainSocketChannel() {
- throw new UnsupportedOperationException(sm.getString("jreCompat.noUnixDomainSocket"));
- }
-+
-+
-+ // Java 8 implementations of Java 19 methods
-+
-+ /**
-+ * Obtains the executor, if any, used to create the provided thread.
-+ *
-+ * @param thread The thread to examine
-+ *
-+ * @return The executor, if any, that created the provided thread
-+ *
-+ * @throws NoSuchFieldException
-+ * If a field used via reflection to obtain the executor cannot
-+ * be found
-+ * @throws SecurityException
-+ * If a security exception occurs while trying to identify the
-+ * executor
-+ * @throws IllegalArgumentException
-+ * If the instance object does not match the class of the field
-+ * when obtaining a field value via reflection
-+ * @throws IllegalAccessException
-+ * If a field is not accessible due to access restrictions
-+ */
-+ public Object getExecutor(Thread thread)
-+ throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
-+
-+ Object result = null;
-+
-+ // Runnable wrapped by Thread
-+ // "target" in Sun/Oracle JDK
-+ // "runnable" in IBM JDK
-+ // "action" in Apache Harmony
-+ Object target = null;
-+ for (String fieldName : new String[] { "target", "runnable", "action" }) {
-+ try {
-+ Field targetField = thread.getClass().getDeclaredField(fieldName);
-+ targetField.setAccessible(true);
-+ target = targetField.get(thread);
-+ break;
-+ } catch (NoSuchFieldException nfe) {
-+ continue;
-+ }
-+ }
-+
-+ // "java.util.concurrent" code is in public domain,
-+ // so all implementations are similar including our
-+ // internal fork.
-+ if (target != null && target.getClass().getCanonicalName() != null &&
-+ (target.getClass().getCanonicalName().equals(
-+ "org.apache.tomcat.util.threads.ThreadPoolExecutor.Worker") ||
-+ target.getClass().getCanonicalName().equals(
-+ "java.util.concurrent.ThreadPoolExecutor.Worker"))) {
-+ Field executorField = target.getClass().getDeclaredField("this$0");
-+ executorField.setAccessible(true);
-+ result = executorField.get(target);
-+ }
-+
-+ return result;
-+ }
- }
-diff --git a/java/org/apache/tomcat/util/compat/LocalStrings.properties b/java/org/apache/tomcat/util/compat/LocalStrings.properties
-index 79427da..c4c2f7d 100644
---- a/java/org/apache/tomcat/util/compat/LocalStrings.properties
-+++ b/java/org/apache/tomcat/util/compat/LocalStrings.properties
-@@ -16,6 +16,8 @@
- jre16Compat.javaPre16=Class not found so assuming code is running on a pre-Java 16 JVM
- jre16Compat.unexpected=Failed to create references to Java 16 classes and methods
-
-+jre19Compat.javaPre19=Class not found so assuming code is running on a pre-Java 19 JVM
-+
- jre9Compat.invalidModuleUri=The module URI provided [{0}] could not be converted to a URL for the JarScanner to process
- jre9Compat.javaPre9=Class not found so assuming code is running on a pre-Java 9 JVM
- jre9Compat.unexpected=Failed to create references to Java 9 classes and methods
-diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
-index d118196..42dfe38 100644
---- a/webapps/docs/config/context.xml
-+++ b/webapps/docs/config/context.xml
-@@ -769,7 +769,11 @@
- therefore requires that the command line option
- -XaddExports:java.base/java.io=ALL-UNNAMED is set
- when running on Java 9 and above. If not specified, the default value of
-- true will be used.
-+ true will be used.
-+ The memory leak associated with ObjectStreamClass has
-+ been fixed in Java 19 onwards, Java 17.0.4 onwards and Java 11.0.16
-+ onwards. The check will be disabled when running on a version
-+ of Java that contains the fix.
-
-
-
-diff --git a/java/org/apache/tomcat/util/compat/Jre19Compat.java b/java/org/apache/tomcat/util/compat/Jre19Compat.java
-new file mode 100644
-index 0000000000..fb94810b40
---- /dev/null
-+++ b/java/org/apache/tomcat/util/compat/Jre19Compat.java
-@@ -0,0 +1,84 @@
-+/*
-+ * Licensed to the Apache Software Foundation (ASF) under one or more
-+ * contributor license agreements. See the NOTICE file distributed with
-+ * this work for additional information regarding copyright ownership.
-+ * The ASF licenses this file to You under the Apache License, Version 2.0
-+ * (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.apache.tomcat.util.compat;
-+
-+import java.lang.reflect.Field;
-+
-+import org.apache.juli.logging.Log;
-+import org.apache.juli.logging.LogFactory;
-+import org.apache.tomcat.util.res.StringManager;
-+
-+public class Jre19Compat extends Jre16Compat {
-+
-+ private static final Log log = LogFactory.getLog(Jre19Compat.class);
-+ private static final StringManager sm = StringManager.getManager(Jre19Compat.class);
-+
-+ private static final boolean supported;
-+
-+ static {
-+ // Don't need any Java 19 specific classes (yet) so just test for one of
-+ // the new ones for now.
-+ Class c1 = null;
-+ try {
-+ c1 = Class.forName("java.lang.WrongThreadException");
-+ } catch (ClassNotFoundException cnfe) {
-+ // Must be pre-Java 16
-+ log.debug(sm.getString("jre19Compat.javaPre19"), cnfe);
-+ }
-+
-+ supported = (c1 != null);
-+ }
-+
-+ static boolean isSupported() {
-+ return supported;
-+ }
-+
-+ @Override
-+ public Object getExecutor(Thread thread)
-+ throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
-+
-+ Object result = super.getExecutor(thread);
-+
-+ if (result == null) {
-+ Object holder = null;
-+ Object task = null;
-+ try {
-+ Field holderField = thread.getClass().getDeclaredField("holder");
-+ holderField.setAccessible(true);
-+ holder = holderField.get(thread);
-+
-+ Field taskField = holder.getClass().getDeclaredField("task");
-+ taskField.setAccessible(true);
-+ task = taskField.get(holder);
-+ } catch (NoSuchFieldException nfe) {
-+ return null;
-+ }
-+
-+ if (task!= null && task.getClass().getCanonicalName() != null &&
-+ (task.getClass().getCanonicalName().equals(
-+ "org.apache.tomcat.util.threads.ThreadPoolExecutor.Worker") ||
-+ task.getClass().getCanonicalName().equals(
-+ "java.util.concurrent.ThreadPoolExecutor.Worker"))) {
-+ Field executorField = task.getClass().getDeclaredField("this$0");
-+ executorField.setAccessible(true);
-+ result = executorField.get(task);
-+ }
-+ }
-+
-+ return result;
-+ }
-+}
diff --git a/SOURCES/tomcat-9.0.conf b/SOURCES/tomcat-9.0.conf
deleted file mode 100644
index e5fa60a..0000000
--- a/SOURCES/tomcat-9.0.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-# System-wide configuration file for tomcat services
-# This will be loaded by systemd as an environment file,
-# so please keep the syntax. For shell expansion support
-# place your custom files as /etc/tomcat/conf.d/*.conf
-#
-# There are 2 "classes" of startup behavior in this package.
-# The old one, the default service named tomcat.service.
-# The new named instances are called tomcat@instance.service.
-#
-# Use this file to change default values for all services.
-# Change the service specific ones to affect only one service.
-# For tomcat.service it's /etc/sysconfig/tomcat, for
-# tomcat@instance it's /etc/sysconfig/tomcat@instance.
-
-# This variable is used to figure out if config is loaded or not.
-TOMCAT_CFG_LOADED="1"
-
-# In new-style instances, if CATALINA_BASE isn't specified, it will
-# be constructed by joining TOMCATS_BASE and NAME.
-TOMCATS_BASE="/var/lib/tomcats/"
-
-# Where your java installation lives
-JAVA_HOME="/usr/lib/jvm/jre"
-
-# Where your tomcat installation lives
-CATALINA_HOME="@@@TCHOME@@@"
-
-# System-wide tmp
-CATALINA_TMPDIR="/var/cache/tomcat/temp"
-
-# You can pass some parameters to java here if you wish to
-#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
-
-# Use JAVA_OPTS to set java.library.path for libtcnative.so
-#JAVA_OPTS="-Djava.library.path=/usr/lib"
-
-# Set default javax.sql.DataSource factory to apache commons one. See rhbz#1214381
-JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory"
-
-# You can change your tomcat locale here
-#LANG="en_US"
-
-# Run tomcat under the Java Security Manager
-SECURITY_MANAGER="false"
-
-# SHUTDOWN_WAIT has been deprecated. To change the shutdown wait time, set
-# TimeoutStopSec in tomcat.service.
-
-# If you wish to further customize your tomcat environment,
-# put your own definitions here
-# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
diff --git a/SOURCES/tomcat-9.0.logrotate b/SOURCES/tomcat-9.0.logrotate
deleted file mode 100644
index 082092a..0000000
--- a/SOURCES/tomcat-9.0.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# This is an example config only and is disabled by default
-# If you wish to use it, you'll need to update /etc/tomcat/logging.properties
-# to prevent catalina*.log from being rotated by Tomcat
-@@@TCLOG@@@/catalina*.log {
- copytruncate
- weekly
- rotate 52
- compress
- missingok
- create 0644 tomcat tomcat
-}
diff --git a/SOURCES/tomcat-9.0.service b/SOURCES/tomcat-9.0.service
deleted file mode 100644
index 832e7c6..0000000
--- a/SOURCES/tomcat-9.0.service
+++ /dev/null
@@ -1,20 +0,0 @@
-# Systemd unit file for default tomcat
-#
-# To create clones of this service:
-# DO NOTHING, use tomcat@.service instead.
-
-[Unit]
-Description=Apache Tomcat Web Application Container
-After=syslog.target network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/tomcat/tomcat.conf
-Environment="NAME="
-EnvironmentFile=-/etc/sysconfig/tomcat
-ExecStart=/usr/libexec/tomcat/server start
-SuccessExitStatus=143
-User=tomcat
-
-[Install]
-WantedBy=multi-user.target
diff --git a/SOURCES/tomcat-9.0.sysconfig b/SOURCES/tomcat-9.0.sysconfig
deleted file mode 100644
index 3117bf7..0000000
--- a/SOURCES/tomcat-9.0.sysconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# Service-specific configuration file for tomcat. This will be sourced by
-# systemd for the default service (tomcat.service)
-# If you want to customize named instance, make a similar file
-# and name it tomcat@instancename.
-
-# You will not need to set this, usually. For default service it equals
-# CATALINA_HOME. For named service, it equals ${TOMCATS_BASE}${NAME}
-#CATALINA_BASE="@@@TCHOME@@@"
-
-# Please take a look at /etc/tomcat/tomcat.conf to have an idea what you
-# can override.
diff --git a/SOURCES/tomcat-9.0.wrapper b/SOURCES/tomcat-9.0.wrapper
deleted file mode 100644
index c97cb85..0000000
--- a/SOURCES/tomcat-9.0.wrapper
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-if [ "$1" = "version" ]; then
- . /usr/libexec/tomcat/preamble
- exec ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
- org.apache.catalina.util.ServerInfo
-fi
-
-SRV="tomcat"
-if [ -n "$2" ]; then
- SRV="tomcat@$2"
-fi
-
-if [ "$1" = "start" ]; then
- systemctl start ${SRV}.service
-elif [ "$1" = "stop" ]; then
- systemctl stop ${SRV}.service
-elif [ "$1" = "version" ]; then
- ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
- org.apache.catalina.util.ServerInfo
-else
- echo "Usage: $0 {start|stop|version} [server-id]"
- exit 1
-fi
diff --git a/SOURCES/tomcat-build.patch b/SOURCES/tomcat-build.patch
deleted file mode 100644
index 49c63ff..0000000
--- a/SOURCES/tomcat-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd
---- ./res/bnd/build-defaults.bnd.orig 2020-07-13 13:47:01.229077747 -0400
-+++ ./res/bnd/build-defaults.bnd 2020-07-13 13:47:12.923095618 -0400
-@@ -13,7 +13,7 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
-
--Bundle-Version: ${version_cleanup;${version}}
-+Bundle-Version: ${version}
-
- Specification-Title: Apache Tomcat
- Specification-Version: ${version.major.minor}
diff --git a/SOURCES/tomcat-functions b/SOURCES/tomcat-functions
deleted file mode 100644
index ab08fa2..0000000
--- a/SOURCES/tomcat-functions
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-if [ -r /usr/share/java-utils/java-functions ]; then
- . /usr/share/java-utils/java-functions
-else
- echo "Can't read Java functions library, aborting"
- exit 1
-fi
-
-_save_function() {
- local ORIG_FUNC=$(declare -f $1)
- local NEWNAME_FUNC="$2${ORIG_FUNC#$1}"
- eval "$NEWNAME_FUNC"
-}
-
-run_jsvc(){
- if [ -x /usr/bin/jsvc ]; then
- TOMCAT_USER="${TOMCAT_USER:-tomcat}"
- JSVC="/usr/bin/jsvc"
-
- JSVC_OPTS="-nodetach -pidfile /var/run/jsvc-tomcat${NAME}.pid -user ${TOMCAT_USER} -outfile ${CATALINA_BASE}/logs/catalina.out -errfile ${CATALINA_BASE}/logs/catalina.out"
- if [ "$1" = "stop" ]; then
- JSVC_OPTS="${JSVC_OPTS} -stop"
- fi
-
- exec "${JSVC}" ${JSVC_OPTS} ${FLAGS} -classpath "${CLASSPATH}" ${OPTIONS} "${MAIN_CLASS}" "${@}"
- else
- echo "Can't find /usr/bin/jsvc executable"
- fi
-
-}
-
-_save_function run run_java
-
-run() {
- if [ "${USE_JSVC}" = "true" ] ; then
- run_jsvc $@
- else
- run_java $@
- fi
-}
-
diff --git a/SOURCES/tomcat-named.service b/SOURCES/tomcat-named.service
deleted file mode 100644
index b6cd8bd..0000000
--- a/SOURCES/tomcat-named.service
+++ /dev/null
@@ -1,24 +0,0 @@
-# Systemd unit file for tomcat instances.
-#
-# To create clones of this service:
-# 0. systemctl enable tomcat@name.service
-# 1. create catalina.base directory structure in
-# /var/lib/tomcats/name
-# 2. profit.
-
-[Unit]
-Description=Apache Tomcat Web Application Container
-After=syslog.target network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/tomcat/tomcat.conf
-Environment="NAME=%i"
-EnvironmentFile=-/etc/sysconfig/tomcat@%i
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
-SuccessExitStatus=143
-User=tomcat
-
-[Install]
-WantedBy=multi-user.target
diff --git a/SOURCES/tomcat-preamble b/SOURCES/tomcat-preamble
deleted file mode 100644
index 1271dca..0000000
--- a/SOURCES/tomcat-preamble
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /usr/libexec/tomcat/functions
-
-# Get the tomcat config (use this for environment specific settings)
-
-if [ -z "${TOMCAT_CFG_LOADED}" ]; then
- if [ -z "${TOMCAT_CFG}" ]; then
- TOMCAT_CFG="/etc/tomcat/tomcat.conf"
- fi
- . $TOMCAT_CFG
-fi
-
-if [ -d "${TOMCAT_CONFD=/etc/tomcat/conf.d}" ]; then
- for file in ${TOMCAT_CONFD}/*.conf ; do
- if [ -f "$file" ] ; then
- . "$file"
- fi
- done
-fi
-
-if [ -z "$CATALINA_BASE" ]; then
- if [ -n "$NAME" ]; then
- if [ -z "$TOMCATS_BASE" ]; then
- TOMCATS_BASE="/var/lib/tomcats/"
- fi
- CATALINA_BASE="${TOMCATS_BASE}${NAME}"
- else
- CATALINA_BASE="${CATALINA_HOME}"
- fi
-fi
-VERBOSE=1
-set_javacmd
-cd ${CATALINA_HOME}
-# CLASSPATH munging
-if [ ! -z "$CLASSPATH" ] ; then
- CLASSPATH="$CLASSPATH":
-fi
-
-if [ -n "$JSSE_HOME" ]; then
- CLASSPATH="${CLASSPATH}$(build-classpath jcert jnet jsse 2>/dev/null):"
-fi
-CLASSPATH="${CLASSPATH}${CATALINA_HOME}/bin/bootstrap.jar"
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
-CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
-
-if [ -z "$LOGGING_PROPERTIES" ] ; then
- LOGGING_PROPERTIES="${CATALINA_BASE}/conf/logging.properties"
- if [ ! -f "${LOGGING_PROPERTIES}" ] ; then
- LOGGING_PROPERTIES="${CATALINA_HOME}/conf/logging.properties"
- fi
-fi
diff --git a/SOURCES/tomcat-server b/SOURCES/tomcat-server
deleted file mode 100644
index 17ae385..0000000
--- a/SOURCES/tomcat-server
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. /usr/libexec/tomcat/preamble
-
-MAIN_CLASS=org.apache.catalina.startup.Bootstrap
-
-FLAGS="$JAVA_OPTS"
-OPTIONS="-Dcatalina.base=$CATALINA_BASE \
--Dcatalina.home=$CATALINA_HOME \
--Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
--Djava.io.tmpdir=$CATALINA_TMPDIR \
--Djava.util.logging.config.file=${LOGGING_PROPERTIES} \
--Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
-
-if [ "$1" = "start" ] ; then
- FLAGS="${FLAGS} $CATALINA_OPTS"
- if [ "${SECURITY_MANAGER}" = "true" ] ; then
- OPTIONS="${OPTIONS} \
- -Djava.security.manager \
- -Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy"
- fi
- run start
-elif [ "$1" = "stop" ] ; then
- run stop
-fi
diff --git a/SPECS/tomcat.spec b/SPECS/tomcat.spec
deleted file mode 100644
index d4def76..0000000
--- a/SPECS/tomcat.spec
+++ /dev/null
@@ -1,1011 +0,0 @@
-# Copyright (c) 2000-2008, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%global jspspec 2.3
-%global major_version 9
-%global minor_version 0
-%global micro_version 62
-%global packdname apache-tomcat-%{version}-src
-%global servletspec 4.0
-%global elspec 3.0
-%global tcuid 53
-# Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java
-%global native_version 1.2.21
-
-
-# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
-%global basedir %{_var}/lib/%{name}
-%global appdir %{basedir}/webapps
-%global homedir %{_datadir}/%{name}
-%global bindir %{homedir}/bin
-%global confdir %{_sysconfdir}/%{name}
-%global libdir %{_javadir}/%{name}
-%global logdir %{_var}/log/%{name}
-%global cachedir %{_var}/cache/%{name}
-%global tempdir %{cachedir}/temp
-%global workdir %{cachedir}/work
-%global _systemddir /lib/systemd/system
-
-Name: tomcat
-Epoch: 1
-Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 11%{?dist}
-Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
-
-License: ASL 2.0
-URL: http://tomcat.apache.org/
-Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz
-Source1: %{name}-%{major_version}.%{minor_version}.conf
-Source3: %{name}-%{major_version}.%{minor_version}.sysconfig
-Source4: %{name}-%{major_version}.%{minor_version}.wrapper
-Source5: %{name}-%{major_version}.%{minor_version}.logrotate
-Source6: %{name}-%{major_version}.%{minor_version}-digest.script
-Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
-Source11: %{name}-%{major_version}.%{minor_version}.service
-Source21: tomcat-functions
-Source30: tomcat-preamble
-Source31: tomcat-server
-Source32: tomcat-named.service
-Source33: java-9-start-up-parameters.conf
-
-Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
-Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
-Patch2: %{name}-build.patch
-Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch
-Patch4: rhbz-1857043.patch
-Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch
-Patch6: %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch
-# The fixes for memory leak which have been fixed in 9.0.64, remove this patch in the next tomcat update
-Patch7: %{name}-%{major_version}.%{minor_version}-memory-leak.patch
-Patch8: fix-malformed-dtd.patch
-
-BuildArch: noarch
-
-BuildRequires: ant
-BuildRequires: ecj >= 1:4.10
-BuildRequires: findutils
-BuildRequires: java-devel >= 1:1.8.0
-BuildRequires: javapackages-local
-BuildRequires: aqute-bnd
-BuildRequires: aqute-bndlib
-BuildRequires: systemd
-
-Requires: java-headless >= 1:1.8.0
-Requires: javapackages-tools
-Requires: %{name}-lib = %{epoch}:%{version}-%{release}
-%if 0%{?fedora} || 0%{?rhel} > 7
-Recommends: tomcat-native >= %{native_version}
-%endif
-Requires(pre): shadow-utils
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-
-# We will change it to an obsoletes whenever the pki team is able to make the switch
-Conflicts: pki-servlet-engine <= 1:9.0.50
-
-# added after log4j sub-package was removed
-Provides: %{name}-log4j = %{epoch}:%{version}-%{release}
-
-%description
-Tomcat is the servlet container that is used in the official Reference
-Implementation for the Java Servlet and JavaServer Pages technologies.
-The Java Servlet and JavaServer Pages specifications are developed by
-Sun under the Java Community Process.
-
-Tomcat is developed in an open and participatory environment and
-released under the Apache Software License version 2.0. Tomcat is intended
-to be a collaboration of the best-of-breed developers from around the world.
-
-%package admin-webapps
-Summary: The host-manager and manager web applications for Apache Tomcat
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description admin-webapps
-The host-manager and manager web applications for Apache Tomcat.
-
-%package docs-webapp
-Summary: The docs web application for Apache Tomcat
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description docs-webapp
-The docs web application for Apache Tomcat.
-
-%package jsp-%{jspspec}-api
-Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes
-Provides: jsp = %{jspspec}
-Obsoletes: %{name}-jsp-2.2-api
-Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
-Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
-Conflicts: pki-servlet-engine <= 1:9.0.50
-
-%description jsp-%{jspspec}-api
-Apache Tomcat JSP API Implementation Classes.
-
-%package lib
-Summary: Libraries needed to run the Tomcat Web container
-Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
-Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
-Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
-Requires: ecj >= 1:4.10
-Requires(preun): coreutils
-Conflicts: pki-servlet-engine <= 1:9.0.50
-
-%description lib
-Libraries needed to run the Tomcat Web container.
-
-%package servlet-%{servletspec}-api
-Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes
-Provides: servlet = %{servletspec}
-Provides: servlet6
-Provides: servlet3
-Obsoletes: %{name}-servlet-3.1-api
-Conflicts: pki-servlet-4.0-api <= 1:9.0.50
-
-%description servlet-%{servletspec}-api
-Apache Tomcat Servlet API Implementation Classes.
-
-%package el-%{elspec}-api
-Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes
-Provides: el_api = %{elspec}
-Obsoletes: %{name}-el-2.2-api
-Conflicts: pki-servlet-engine <= 1:9.0.50
-
-%description el-%{elspec}-api
-Apache Tomcat EL API Implementation Classes.
-
-%package webapps
-Summary: The ROOT web application for Apache Tomcat
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description webapps
-The ROOT web application for Apache Tomcat.
-
-%prep
-%setup -q -n %{packdname}
-# remove pre-built binaries and windows files
-find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
- -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete
-
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p1
-%patch8 -p1
-
-# Remove webservices naming resources as it's generally unused
-%{__rm} -rf java/org/apache/naming/factory/webservices
-
-# Configure maven files
-%mvn_package ":tomcat-el-api" tomcat-el-api
-%mvn_alias "org.apache.tomcat:tomcat-el-api" "org.eclipse.jetty.orbit:javax.el"
-%mvn_package ":tomcat-jsp-api" tomcat-jsp-api
-%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "org.eclipse.jetty.orbit:javax.servlet.jsp"
-%mvn_package ":tomcat-servlet-api" tomcat-servlet-api
-
-
-%build
-export OPT_JAR_LIST="xalan-j2-serializer"
-# we don't care about the tarballs and we're going to replace
-# tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar
-# so just create a dummy file for later removal
-touch HACK
-
-# who needs a build.properties file anyway
-%{ant} -Dbase.path="." \
- -Dbuild.compiler="modern" \
- -Dcommons-daemon.jar="HACK" \
- -Dcommons-daemon.native.src.tgz="HACK" \
- -Djdt.jar="$(build-classpath ecj/ecj)" \
- -Dtomcat-native.tar.gz="HACK" \
- -Dtomcat-native.home="." \
- -Dcommons-daemon.native.win.mgr.exe="HACK" \
- -Dnsis.exe="HACK" \
- -Djaxrpc-lib.jar="HACK" \
- -Dwsdl4j-lib.jar="HACK" \
- -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \
- -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
- -Dversion="%{version}" \
- -Dversion.build="%{micro_version}" \
- deploy
-
-# remove some jars that we'll replace with symlinks later
-%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar
-# Remove the example webapps per Apache Tomcat Security Considerations
-# see https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html
-%{__rm} -rf output/build/webapps/examples
-
-
-%install
-# build initial path structure
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_systemddir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{bindir}
-%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}
-%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost
-%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/conf.d
-/bin/echo "Place your custom *.conf files here. Shell expansion is supported." > ${RPM_BUILD_ROOT}%{confdir}/conf.d/README
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
-%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir}
-%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats
-%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}
-%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
-%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_unitdir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}
-
-# move things into place
-# First copy supporting libs to tomcat lib
-pushd output/build
- %{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
- %{__cp} -a conf/*.{policy,properties,xml,xsd} ${RPM_BUILD_ROOT}%{confdir}
- %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
- %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir}
-popd
-
-%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
- -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
- -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE1} \
- > ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf
-%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
- -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
- -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
- > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
-%{__install} -m 0644 %{SOURCE4} \
- ${RPM_BUILD_ROOT}%{_sbindir}/%{name}
-%{__install} -m 0644 %{SOURCE11} \
- ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
-%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
- > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled
-%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
- -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
- -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \
- > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest
-%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
- -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
- -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
- > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper
-
-%{__install} -m 0644 %{SOURCE21} \
- ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions
-%{__install} -m 0755 %{SOURCE30} \
- ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble
-%{__install} -m 0755 %{SOURCE31} \
- ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server
-%{__install} -m 0644 %{SOURCE32} \
- ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service
-
-%{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{confdir}/conf.d/
-
-# Substitute libnames in catalina-tasks.xml
-sed -i \
- "s,el-api.jar,%{name}-el-%{elspec}-api.jar,;
- s,servlet-api.jar,%{name}-servlet-%{servletspec}-api.jar,;
- s,jsp-api.jar,%{name}-jsp-%{jspspec}-api.jar,;" \
- ${RPM_BUILD_ROOT}%{bindir}/catalina-tasks.xml
-
-# create jsp and servlet API symlinks
-pushd ${RPM_BUILD_ROOT}%{_javadir}
- %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar
- %{__ln_s} %{name}-jsp-%{jspspec}-api.jar %{name}-jsp-api.jar
- %{__mv} %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api.jar
- %{__ln_s} %{name}-servlet-%{servletspec}-api.jar %{name}-servlet-api.jar
- %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api.jar
- %{__ln_s} %{name}-el-%{elspec}-api.jar %{name}-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/%{name}-jsp-%{jspspec}-api.jar .
- %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar .
- %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar .
- %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar
-popd
-
-# symlink to the FHS locations where we've installed things
-pushd ${RPM_BUILD_ROOT}%{homedir}
- %{__ln_s} %{appdir} webapps
- %{__ln_s} %{confdir} conf
- %{__ln_s} %{libdir} lib
- %{__ln_s} %{logdir} logs
- %{__ln_s} %{tempdir} temp
- %{__ln_s} %{workdir} work
-popd
-
-# Install the maven metadata for the spec impl artifacts as other projects use them
-#%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
-pushd res/maven
- for pom in tomcat-el-api.pom tomcat-jsp-api.pom tomcat-servlet-api.pom; do
- # fix-up version in all pom files
- sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom
- done
-popd
-
-# Configure and install maven artifacts
-%mvn_artifact res/maven/tomcat-el-api.pom output/build/lib/el-api.jar
-%mvn_artifact res/maven/tomcat-jsp-api.pom output/build/lib/jsp-api.jar
-%mvn_artifact res/maven/tomcat-servlet-api.pom output/build/lib/servlet-api.jar
-%mvn_install
-
-%pre
-# add the tomcat user and group
-getent group tomcat >/dev/null || %{_sbindir}/groupadd -f -g %{tcuid} -r tomcat
-if ! getent passwd tomcat >/dev/null ; then
- if ! getent passwd %{tcuid} >/dev/null ; then
- %{_sbindir}/useradd -r -u %{tcuid} -g tomcat -d %{homedir} -s /sbin/nologin -c "Apache Tomcat" tomcat
- # Tomcat uses a reserved ID, so there should never be an else
- fi
-fi
-exit 0
-
-%post
-# install but don't activate
-%systemd_post %{name}.service
-
-%post jsp-%{jspspec}-api
-%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
- %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200
-
-%post servlet-%{servletspec}-api
-%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
- %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
-
-%post el-%{elspec}-api
-%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \
- %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
-
-%preun
-# clean tempdir and workdir on removal or upgrade
-%{__rm} -rf %{workdir}/* %{tempdir}/*
-%systemd_preun %{name}.service
-
-%postun
-%systemd_postun_with_restart %{name}.service
-
-%postun jsp-%{jspspec}-api
-if [ "$1" = "0" ]; then
- %{_sbindir}/update-alternatives --remove jsp \
- %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
-fi
-
-%postun servlet-%{servletspec}-api
-if [ "$1" = "0" ]; then
- %{_sbindir}/update-alternatives --remove servlet \
- %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
-fi
-
-%postun el-%{elspec}-api
-if [ "$1" = "0" ]; then
- %{_sbindir}/update-alternatives --remove elspec \
- %{_javadir}/%{name}-el-%{elspec}-api.jar
-fi
-
-%files
-%defattr(0664,root,tomcat,0755)
-%doc {LICENSE,NOTICE,RELEASE*}
-%attr(0755,root,root) %{_bindir}/%{name}-digest
-%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
-%attr(0755,root,root) %{_sbindir}/%{name}
-%attr(0644,root,root) %{_unitdir}/%{name}.service
-%attr(0644,root,root) %{_unitdir}/%{name}@.service
-%attr(0755,root,root) %dir %{_libexecdir}/%{name}
-%attr(0755,root,root) %dir %{_localstatedir}/lib/tomcats
-%attr(0644,root,root) %{_libexecdir}/%{name}/functions
-%attr(0755,root,root) %{_libexecdir}/%{name}/preamble
-%attr(0755,root,root) %{_libexecdir}/%{name}/server
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}.disabled
-%attr(0755,root,tomcat) %dir %{basedir}
-%attr(0755,root,tomcat) %dir %{confdir}
-
-%defattr(0664,tomcat,root,0770)
-%attr(0770,tomcat,root) %dir %{logdir}
-
-%defattr(0664,root,tomcat,0770)
-%attr(0770,root,tomcat) %dir %{cachedir}
-%attr(0770,root,tomcat) %dir %{tempdir}
-%attr(0770,root,tomcat) %dir %{workdir}
-
-%defattr(0644,root,tomcat,0775)
-%attr(0775,root,tomcat) %dir %{appdir}
-%attr(0775,root,tomcat) %dir %{confdir}/Catalina
-%attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
-%attr(0755,root,tomcat) %dir %{confdir}/conf.d
-%{confdir}/conf.d/README
-%{confdir}/conf.d/java-9-start-up-parameters.conf
-%config(noreplace) %{confdir}/%{name}.conf
-%config(noreplace) %{confdir}/*.policy
-%config(noreplace) %{confdir}/*.properties
-%config(noreplace) %{confdir}/context.xml
-%config(noreplace) %{confdir}/server.xml
-%attr(0640,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
-%attr(0664,root,tomcat) %{confdir}/tomcat-users.xsd
-%attr(0664,root,tomcat) %config(noreplace) %{confdir}/jaspic-providers.xml
-%attr(0664,root,tomcat) %{confdir}/jaspic-providers.xsd
-%config(noreplace) %{confdir}/web.xml
-%dir %{homedir}
-%{bindir}/bootstrap.jar
-%{bindir}/catalina-tasks.xml
-%{homedir}/lib
-%{homedir}/temp
-%{homedir}/webapps
-%{homedir}/work
-%{homedir}/logs
-%{homedir}/conf
-
-%files admin-webapps
-%defattr(0664,root,tomcat,0755)
-%{appdir}/host-manager
-%{appdir}/manager
-
-%files docs-webapp
-%{appdir}/docs
-
-%files lib
-%dir %{libdir}
-%{libdir}/*.jar
-%{_javadir}/*.jar
-%{bindir}/tomcat-juli.jar
-%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
-%exclude %{_javadir}/%{name}-servlet-%{servletspec}*.jar
-%exclude %{_javadir}/%{name}-el-%{elspec}-api.jar
-%exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar
-
-%files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api
-%{_javadir}/%{name}-jsp-%{jspspec}*.jar
-
-%files servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api
-%doc LICENSE
-%{_javadir}/%{name}-servlet-%{servletspec}*.jar
-
-%files el-%{elspec}-api -f .mfiles-tomcat-el-api
-%doc LICENSE
-%{_javadir}/%{name}-el-%{elspec}-api.jar
-%{libdir}/%{name}-el-%{elspec}-api.jar
-
-%files webapps
-%defattr(0644,tomcat,tomcat,0755)
-%{appdir}/ROOT
-
-
-%changelog
-* Thu Feb 23 2023 Hui Wang - 1:9.0.62-11
-- Bump release so that the NVR on RHEL-9 is higher than RHEL-8
-
-* Wed Feb 15 2023 Hui Wang - 1:9.0.62-4
-- Bump release to run the tier1 test
-
-* Tue Feb 07 2023 Coty Sutherland - 1:9.0.62-3
-- Add conflicts declaration to the appropriate subpackages
-- Fix malformed DTD file that caused problems with rpminspect
-
-* Fri Feb 03 2023 Hui Wang - 1:9.0.62-2
-- Add conflicts with the pki-servlet-engine package
-
-* Mon Jan 16 2023 Hui Wang - 1:9.0.62-1
-- Update to 9.0.62. Related: rhbz#2160511
-- Remove examples webapps from subpackage
-- Remove maven artifacts from build as they aren't very useful
-- Drop JSVC support as it's not very useful these days
-- Drop geronimo-saaj as it's no longer required
-- Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused
-- Cleaning up some unused deps and system properties
-- Add Java 9 start-up parameters to allow reflection
-- Add bnd-annotation which is in bndlib
-- Add fixes for memory leak which have been fixed in 9.0.64
-
-* Fri Apr 16 2021 Mohan Boddu - 1:9.0.44-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Mar 18 2021 Hui Wang - 1:9.0.44-1
-- Update to 9.0.44
-
-* Wed Feb 03 2021 Hui Wang - 1:9.0.43-1
-- Update to 9.0.43
-
-* Wed Jan 27 2021 Fedora Release Engineering - 1:9.0.41-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Dec 09 2020 Hui Wang - 1:9.0.41-1
-- Update to 9.0.41
-
-* Wed Nov 18 2020 Hui Wang - 1:9.0.40-1
-- Update to 9.0.40
-
-* Mon Oct 12 2020 Hui Wang - 1:9.0.39-1
-- Update to 9.0.39
-
-* Wed Sep 16 2020 Hui Wang - 1:9.0.38-1
-- Update to 9.0.38
-
-* Wed Jul 29 2020 Fedora Release Engineering - 1:9.0.37-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 24 2020 Coty Sutherland - 1:9.0.37-3
-- Related: rhbz#1857043 Temporarily remove OSGi metadata from tomcat jars
-
-* Mon Jul 20 2020 Coty Sutherland - 1:9.0.37-2
-- Resolves: rhbz#1857043 Add patch to reinclude o.a.t.util.net.jsse and o.a.t.util.moduler.modules in tomcat-coyote.jar
-
-* Mon Jul 13 2020 Coty Sutherland - 1:9.0.37-1
-- Update to 9.0.37
-
-* Sat Jul 11 2020 Jiri Vanek - 1:9.0.36-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jun 10 2020 Hui Wang - 1:9.0.36-1
-- Upgrade to 9.0.36
-
-* Sun May 31 2020 Hui Wang - 1:9.0.35-2
-- Upgrade to 9.0.35
-
-* Wed Apr 22 2020 Coty Sutherland - 1:9.0.34-2
-- Add updated catalina.policy patch to allow ECJ usage under the Security Manager
-
-* Tue Apr 21 2020 Coty Sutherland - 1:9.0.34-1
-- Update to 9.0.34
-
-* Thu Mar 05 2020 Coty Sutherland - 1:9.0.31-1
-- Update to 9.0.31
-- Resolves: rhbz#1806398 - CVE-2020-1938 tomcat: Apache Tomcat AJP File Read/Inclusion Vulnerability
-
-* Fri Jan 31 2020 Fedora Release Engineering - 1:9.0.30-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Dec 20 2019 Coty Sutherland - 1:9.0.30-1
-- Update to 9.0.30
-
-* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-2
-- Resolves: rhbz#1510522 man page uid and gid mismatch for service accounts
-
-* Thu Sep 26 2019 Coty Sutherland - 1:9.0.26-1
-- Update to 9.0.26
-- Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names
-- Resolves: rhbz#1510896 Problem to start tomcat with a user whose group has a name different to the user
-
-* Sat Jul 27 2019 Fedora Release Engineering - 1:9.0.21-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jul 17 2019 Coty Sutherland - 1:9.0.21-2
-- Update build-classpath calls to ECJ to specify the JAR we want to use
-
-* Tue Jun 18 2019 Coty Sutherland - 1:9.0.21-1
-- Update to 9.0.21
-
-* Tue Apr 02 2019 Coty Sutherland - 1:9.0.13-4
-- Remove javadoc subpackage to drop the jpackage-utils dependency
-
-* Wed Feb 20 2019 Coty Sutherland - 1:9.0.13-3
-- Remove OSGi MANIFEST files, these are now included in the upstream Tomcat distribution (as of 9.0.10)
-- Remove unused dependencies, apache-commons-collections, apache-commons-daemon, apache-commons-pool, junit
-
-* Sun Feb 03 2019 Fedora Release Engineering - 1:9.0.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Dec 13 2018 Coty Sutherland - 1:9.0.13-1
-- Update to 9.0.13
-- Resolves: rhbz#1636513 - CVE-2018-11784 tomcat: Open redirect in default servlet
-
-* Sun Oct 14 2018 Peter Robinson 1:9.0.10-2
-- Drop legcy sys-v bits
-
-* Tue Jul 31 2018 Coty Sutherland - 1:9.0.10-1
-- Update to 9.0.10
-- Resolves: rhbz#1624929 - CVE-2018-1336 tomcat: A bug in the UTF-8 decoder can lead to DoS
-- Resolves: rhbz#1579612 - CVE-2018-8014 tomcat: Insecure defaults in CORS filter enable 'supportsCredentials' for all origins
-- Resolves: rhbz#1607586 - CVE-2018-8034 tomcat: host name verification missing in WebSocket client
-- Resolves: rhbz#1607584 - CVE-2018-8037 tomcat: Due to a mishandling of close in NIO/NIO2 connectors user sessions can get mixed up
-
-* Sat Jul 14 2018 Fedora Release Engineering - 1:9.0.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue May 01 2018 Coty Sutherland - 1:9.0.7-1
-- Update to 9.0.7
-
-* Thu Mar 15 2018 Coty Sutherland - 1:8.5.29-1
-- Update to 8.5.29
-- Resolves: rhbz#1548290 CVE-2018-1304 tomcat: Incorrect handling of empty string URL in security constraints can lead to unitended exposure of resources
-- Resolves: rhbz#1548284 CVE-2018-1305 tomcat: Late application of security constraints can lead to resource exposure for unauthorised users
-
-* Fri Feb 09 2018 Igor Gnatenko - 1:8.0.49-2
-- Escape macros in %%changelog
-
-* Thu Feb 01 2018 Coty Sutherland - 1:8.0.49-1
-- Update to 8.0.49
-
-* Tue Dec 12 2017 Merlin Mathesius - 1:8.0.47-3
-- Cleanup spec file conditionals
-
-* Tue Oct 24 2017 Troy Dawson - 1:8.0.47-2
-- Change "zip -u" to "zip"
-- Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition
-
-* Wed Oct 04 2017 Coty Sutherland - 1:8.0.47-1
-- Update to 8.0.47
-- Resolves: rhbz#1497682 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615
-
-* Mon Aug 21 2017 Coty Sutherland - 1:8.0.46-1
-- Update to 8.0.46
-- Resolves: rhbz#1480620 CVE-2017-7674 tomcat: Cache Poisoning
-
-* Thu Jul 27 2017 Fedora Release Engineering - 1:8.0.44-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jun 09 2017 Coty Sutherland - 1:8.0.44-1
-- Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism
-
-* Tue Apr 11 2017 Coty Sutherland - 1:8.0.43-1
-- Update to 8.0.43
-
-* Fri Mar 31 2017 Coty Sutherland - 1:8.0.42-1
-- Update to 8.0.42
-
-* Thu Feb 16 2017 Coty Sutherland - 1:8.0.41-1
-- Update to 8.0.41
-- Resolves: rhbz#1403825 CVE-2016-8745 tomcat: information disclosure due to incorrect Processor sharing
-
-* Sat Feb 11 2017 Fedora Release Engineering - 1:8.0.39-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Nov 29 2016 Coty Sutherland - 1:8.0.39-1
-- Update to 8.0.39
-- Resolves: rhbz#1397493 CVE-2016-6816 CVE-2016-6817 CVE-2016-8735 tomcat: various flaws
-
-* Tue Oct 25 2016 Coty Sutherland - 1:8.0.38-1
-- Update to 8.0.38
-
-* Sun Oct 23 2016 Coty Sutherland - 1:8.0.37-3
-- Resolves: rhbz#1383216 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation
-- Resolves: rhbz#1382310 CVE-2016-5425 tomcat: Local privilege escalation via systemd-tmpfiles service
-
-* Tue Sep 13 2016 Coty Sutherland - 1:8.0.37-1
-- Rebase to 8.0.37
-- Resolves: rhbz#1375581 CVE-2016-5388 CGI sets environmental variable based on user supplied Proxy request header
-- Resolves: rhbz#1370262 catalina.out is no longer in use in the main package, but still gets rotated
-
-* Thu Aug 11 2016 Coty Sutherland - 1:8.0.36-2
-- Related: rhbz#1349469 Correct typo in changelog entry
-
-* Mon Aug 08 2016 Coty Sutherland - 1:8.0.36-1
-- Resolves: rhbz#1349469 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36)
-- Resolves: rhbz#1364056 The command tomcat-digest doesn't work
-- Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken
-- Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully
-- Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled)
-- Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out
-- Resolves: rhbz#1341850 tomcat-jsvc.service has TOMCAT_USER value hard-coded
-- Resolves: rhbz#1359737 Missing maven depmap for the following artifacts: org.apache.tomcat:tomcat-websocket, org.apache.tomcat:tomcat-websocket-api
-- Resolves: asfbz#59960 Building javadocs with java8 fails
-
-* Wed Mar 2 2016 Ivan Afonichev - 1:8.0.32-4
-- Revert sysconfig migration changes, resolves: rhbz#1311771, rhbz#1311905
-- Add /etc/tomcat/conf.d/ with shell expansion support, resolves rhbz#1293636
-
-* Sat Feb 27 2016 Ivan Afonichev - 1:8.0.32-3
-- Load sysconfig from tomcat.conf, resolves: rhbz#1311771, rhbz#1311905
-- Set default javax.sql.DataSource factory to apache commons one, resolves rhbz#1214381
-
-* Sun Feb 21 2016 Ivan Afonichev - 1:8.0.32-2
-- Fix symlinks from $CATALINA_HOME/lib perspective, resolves: rhbz#1308685
-
-* Thu Feb 11 2016 Ivan Afonichev - 1:8.0.32-1
-- Updated to 8.0.32
-- Remove log4j support. It has never been working actually. See rhbz#1236297
-- Move shipped config to /etc/sysconfig/tomcat. /etc/tomcat/tomcat.conf can now be used to override it with shell expansion, resolves rhbz#1293636
-- Recommend tomcat-native, resolves: rhbz#1243132
-
-* Wed Feb 10 2016 Coty Sutherland 1:8.0.26-4
-- Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking="true" in context.xml
-- Program /bin/nologin does not exist (#1302718)
-
-* Fri Feb 05 2016 Fedora Release Engineering - 1:8.0.26-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Nov 11 2015 Robert Scheck 1:8.0.26-2
-- CATALINA_OPTS are only read when SECURITY_MANAGER is true (#1147105)
-
-* Thu Aug 27 2015 Alexander Kurtakov 1:8.0.26-1
-- Update to 8.0.26.
-
-* Fri Jul 10 2015 Alexander Kurtakov 1:8.0.24-2
-- Update to 8.0.24.
-
-* Fri Jun 19 2015 Alexander Kurtakov 1:8.0.23-2
-- Drop javax.el:el-api alias.
-
-* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.23-1
-- Update to 8.0.23.
-
-* Thu Jun 18 2015 Alexander Kurtakov 1:8.0.20-3
-- Drop jetty alias for servlet.
-
-* Tue Jun 09 2015 Michal Srb - 1:8.0.20-2
-- Fix metadata for org.apache.tomcat:{tomcat-jni,tomcat-util-scan}
-
-* Thu Mar 5 2015 Alexander Kurtakov 1:8.0.18-5
-- Rebuild against tomcat-taglibs-standard.
-
-* Wed Mar 4 2015 Alexander Kurtakov 1:8.0.18-4
-- Fix epoch bumped el_1_0_api that would override all other glassfish/jboss/etc. due to wrong epoch.
-- Drop old provides.
-
-* Tue Mar 03 2015 Stephen Gallagher 1:8.0.18-3
-- Bump epoch to maintain upgrade path from Fedora 22
-
-* Mon Feb 16 2015 Michal Srb - 0:8.0.18-2
-- Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan}
-
-* Sun Feb 15 2015 Ivan Afonichev 0:8.0.18-1
-- Updated to 8.0.18
-
-* Sat Sep 20 2014 Ivan Afonichev 0:8.0.12-1
-- Updated to 8.0.12
-- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439
-- Use CATALINA_OPTS only on start, resolves: rhbz#1051194
-
-* Mon Jun 16 2014 Michal Srb - 0:7.0.54-3
-- jsp-api requires el-api
-
-* Sun Jun 08 2014 Fedora Release Engineering - 0:7.0.54-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Jun 5 2014 Alexander Kurtakov 0:7.0.54-1
-- Update to upstream 7.0.54 - fixes compile with Java 8.
-
-* Wed May 21 2014 Alexander Kurtakov 0:7.0.52-3
-- Drop servlet/el api provides to reduce user machines ending with both.
-
-* Sun Mar 30 2014 Ivan Afonichev 0:7.0.52-2
-- Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949
-- Move log4j support into subpackage, resolves: rhbz#1027716
-
-* Wed Mar 26 2014 Ivan Afonichev 0:7.0.52-1
-- Updated to 7.0.52
-- Rewrite jsvc implementation, resolves: rhbz#1051743
-- Switch to java-headless R, resolves: rhbz#1068566
-- Create and own %%{_localstatedir}/lib/tomcats, resolves: rhbz#1026741
-- Add pom for tomcat-jdbc, resolves: rhbz#1011003
-
-* Tue Jan 21 2014 Mikolaj Izdebski - 0:7.0.47-3
-- Fix installation of Maven metadata for tomcat-juli.jar
-- Resolves: rhbz#1033664
-
-* Wed Jan 15 2014 Stanislav Ochotnicky - 0:7.0.47-2
-- Rebuild for bug #1033664
-
-* Sun Nov 03 2013 Ivan Afonichev 0:7.0.47-1
-- Updated to 7.0.47
-- Fix java.security.policy
-
-* Sun Aug 04 2013 Fedora Release Engineering - 0:7.0.42-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Jul 12 2013 Ivan Afonichev 0:7.0.42-2
-- Remove jpackage-utils R
-
-* Thu Jul 11 2013 Dmitry Tikhonov 0:7.0.42-1
-- Updated to 7.0.42
-
-* Tue Jun 11 2013 Paul Komkoff 0:7.0.40-3
-- Dropped systemv inits. Bye-bye.
-- Updated the systemd wrappers to allow running multiple instances.
- Added wrapper scripts to do that, ported the original non-named
- service file to work with the same wrappers, updated
- /usr/sbin/tomcat to call systemctl.
-
-* Sat May 11 2013 Ivan Afonichev 0:7.0.40-1
-- Updated to 7.0.40
-- Resolves: rhbz 956569 added missing commons-pool link
-- Remove ant-nodeps BR
-
-* Mon Mar 4 2013 Mikolaj Izdebski - 0:7.0.37-2
-- Add depmaps for org.eclipse.jetty.orbit
-- Resolves: rhbz#917626
-
-* Wed Feb 20 2013 Ivan Afonichev 0:7.0.39-1
-- Updated to 7.0.39
-
-* Wed Feb 20 2013 Ivan Afonichev 0:7.0.37-1
-- Updated to 7.0.37
-
-* Mon Feb 4 2013 Ivan Afonichev 0:7.0.35-1
-- Updated to 7.0.35
-- systemd SuccessExitStatus=143 for proper stop exit code processing
-
-* Mon Dec 24 2012 Ivan Afonichev 0:7.0.34-1
-- Updated to 7.0.34
-- ecj >= 4.2.1 now required
-- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME
-
-* Fri Dec 7 2012 Ivan Afonichev 0:7.0.33-2
-- Resolves: rhbz 883806 refix logdir ownership
-
-* Sun Dec 2 2012 Ivan Afonichev 0:7.0.33-1
-- Updated to 7.0.33
-- Resolves: rhbz 873620 need chkconfig for update-alternatives
-
-* Wed Oct 17 2012 Ivan Afonichev 0:7.0.32-1
-- Updated to 7.0.32
-- Resolves: rhbz 842620 symlinks to taglibs
-
-* Fri Aug 24 2012 Ivan Afonichev 0:7.0.29-1
-- Updated to 7.0.29
-- Add pidfile as tmpfile
-- Use systemd for running as unprivileged user
-- Resolves: rhbz 847751 upgrade path was broken
-- Resolves: rhbz 850343 use new systemd-rpm macros
-
-* Sat Jul 21 2012 Fedora Release Engineering - 0:7.0.28-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jul 2 2012 Ivan Afonichev 0:7.0.28-1
-- Updated to 7.0.28
-- Resolves: rhbz 820119 Remove bundled apache-commons-dbcp
-- Resolves: rhbz 814900 Added tomcat-coyote POM
-- Resolves: rhbz 810775 Remove systemv stuff from %%post scriptlet
-- Remove redhat-lsb R
-
-* Mon Apr 9 2012 Ivan Afonichev 0:7.0.27-2
-- Fixed native download hack
-
-* Sat Apr 7 2012 Ivan Afonichev 0:7.0.27-1
-- Updated to 7.0.27
-- Fixed jakarta-taglibs-standard BR and R
-
-* Wed Mar 21 2012 Stanislav Ochotnicky - 0:7.0.26-2
-- Add more depmaps to J2EE apis to help jetty/glassfish updates
-
-* Wed Mar 14 2012 Juan Hernandez 0:7.0.26-2
-- Added the POM files for tomcat-api and tomcat-util (#803495)
-
-* Wed Feb 22 2012 Ivan Afonichev 0:7.0.26-1
-- Updated to 7.0.26
-- Bug 790334: Change ownership of logdir for logrotate
-
-* Thu Feb 16 2012 Krzysztof Daniel 0:7.0.25-4
-- Bug 790694: Priorities of jsp, servlet and el packages updated.
-
-* Wed Feb 8 2012 Krzysztof Daniel 0:7.0.25-3
-- Dropped indirect dependecy to tomcat 5
-
-* Sun Jan 22 2012 Ivan Afonichev 0:7.0.25-2
-- Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly
-
-* Sat Jan 21 2012 Ivan Afonichev 0:7.0.25-1
-- Updated to 7.0.25
-- Removed EntityResolver patch (changes already in upstream sources)
-- Place poms and depmaps in the same package as jars
-- Added javax.servlet.descriptor to export-package of servlet-api
-- Move several chkconfig actions and reqs to systemv subpackage
-- New maven depmaps generation method
-- Add patch to support java7. (patch sent upstream).
-- Require java >= 1:1.6.0
-
-* Fri Jan 13 2012 Krzysztof Daniel 0:7.0.23-5
-- Exported javax.servlet.* packages in version 3.0 as 2.6 to make
- servlet-api compatible with Eclipse.
-
-* Thu Jan 12 2012 Ivan Afonichev 0:7.0.23-4
-- Move jsvc support to subpackage
-
-* Wed Jan 11 2012 Alexander Kurtakov 0:7.0.23-2
-- Add EntityResolver setter patch to jasper for jetty's need. (patch sent upstream).
-
-* Mon Dec 12 2011 Joseph D. Wagner 0:7.0.23-3
-- Added support to /usr/sbin/tomcat-sysd and /usr/sbin/tomcat for
- starting tomcat with jsvc, which allows tomcat to perform some
- privileged operations (e.g. bind to a port < 1024) and then switch
- identity to a non-privileged user. Must add USE_JSVC="true" to
- /etc/tomcat/tomcat.conf or /etc/sysconfig/tomcat.
-
-* Mon Nov 28 2011 Ivan Afonichev 0:7.0.23-1
-- Updated to 7.0.23
-
-* Fri Nov 11 2011 Ivan Afonichev 0:7.0.22-2
-- Move tomcat-juli.jar to lib package
-- Drop %%update_maven_depmap as in tomcat6
-- Provide native systemd unit file ported from tomcat6
-
-* Thu Oct 6 2011 Ivan Afonichev 0:7.0.22-1
-- Updated to 7.0.22
-
-* Mon Oct 03 2011 Rex Dieter - 0:7.0.21-3.1
-- rebuild (java), rel-eng#4932
-
-* Mon Sep 26 2011 Ivan Afonichev 0:7.0.21-3
-- Fix basedir mode
-
-* Tue Sep 20 2011 Roland Grunberg 0:7.0.21-2
-- Add manifests for el-api, jasper-el, jasper, tomcat, and tomcat-juli.
-
-* Thu Sep 8 2011 Ivan Afonichev 0:7.0.21-1
-- Updated to 7.0.21
-
-* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-3
-- Require java = 1:1.6.0
-
-* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-2
-- Require java < 1.7.0
-
-* Mon Aug 15 2011 Ivan Afonichev 0:7.0.20-1
-- Updated to 7.0.20
-
-* Tue Jul 26 2011 Ivan Afonichev 0:7.0.19-1
-- Updated to 7.0.19
-
-* Tue Jun 21 2011 Ivan Afonichev 0:7.0.16-1
-- Updated to 7.0.16
-
-* Mon Jun 6 2011 Ivan Afonichev 0:7.0.14-3
-- Added initial systemd service
-- Fix some paths
-
-* Sat May 21 2011 Ivan Afonichev 0:7.0.14-2
-- Fixed http source link
-- Securify some permissions
-- Added licenses for el-api and servlet-api
-- Added dependency on jpackage-utils for the javadoc subpackage
-
-* Sat May 14 2011 Ivan Afonichev 0:7.0.14-1
-- Updated to 7.0.14
-
-* Thu May 5 2011 Ivan Afonichev 0:7.0.12-4
-- Provided local paths for libs
-- Fixed dependencies
-- Fixed update temp/work cleanup
-
-* Mon May 2 2011 Ivan Afonichev 0:7.0.12-3
-- Fixed package groups
-- Fixed some permissions
-- Fixed some links
-- Removed old tomcat6 crap
-
-* Thu Apr 28 2011 Ivan Afonichev 0:7.0.12-2
-- Package now named just tomcat instead of tomcat7
-- Removed Provides: %%{name}-log4j
-- Switched to apache-commons-* names instead of jakarta-commons-* .
-- Remove the old changelog
-- BR/R java >= 1:1.6.0 , same for java-devel
-- Removed old tomcat6 crap
-
-* Wed Apr 27 2011 Ivan Afonichev 0:7.0.12-1
-- Tomcat7