From e1649f2ab0a75c2d2bd25860a49679e188450e4d Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 14 Apr 2022 12:39:35 -0700 Subject: [PATCH] jetty package is retired on c9s for CS-686 --- .gitignore | 70 -- 0001-Distro-jetty.home.patch | 25 - 0002-Port-to-servlet-api-4-5.patch | 76 -- LICENSE-MIT | 10 - dead.package | 1 + jetty.logrotate | 7 - jetty.service | 18 - jetty.sh | 135 --- jetty.spec | 1764 ---------------------------- sources | 1 - 10 files changed, 1 insertion(+), 2106 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Distro-jetty.home.patch delete mode 100644 0002-Port-to-servlet-api-4-5.patch delete mode 100644 LICENSE-MIT create mode 100644 dead.package delete mode 100644 jetty.logrotate delete mode 100644 jetty.service delete mode 100644 jetty.sh delete mode 100644 jetty.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6975d60..0000000 --- a/.gitignore +++ /dev/null @@ -1,70 +0,0 @@ -/jetty-8.1.0.RC4.tar.bz2 -/jetty-8.1.0.RC5.tar.bz2 -/jetty-8.1.0.v20120127.tar.bz2 -/jetty-8.1.2.v20120308.tar.bz2 -/jetty-8.1.4.v20120524.tar.bz2 -/jetty-9.0.0.RC2.tar.gz -/jetty-9.0.0.RC3.tar.gz -/jetty-9.0.0.v20130308.tar.gz -/jetty-9.0.2.v20130417.tar.gz -/jetty-9.0.3.v20130506.tar.gz -/jetty-9.0.4.v20130625.tar.gz -/jetty-9.0.5.v20130815.tar.gz -/jetty-9.0.6.v20130930.tar.gz -/jetty-9.1.0.v20131115.tar.gz -/jetty-9.1.1.v20140108.tar.gz -/jetty-9.1.2.v20140210.tar.gz -/jetty-9.1.3.v20140225.tar.gz -/jetty-9.1.4.v20140401.tar.gz -/jetty-9.1.5.v20140505.tar.gz -/jetty-9.2.0.v20140526.tar.gz -/jetty-9.2.1.v20140609.tar.gz -/jetty-9.2.2.v20140723.tar.gz -/jetty-9.2.3.v20140905.tar.gz -/jetty-9.2.6.v20141205.tar.gz -/jetty-9.2.7.v20150116.tar.gz -/jetty-9.2.9.v20150224.tar.gz -/jetty-9.3.0.M2.tar.gz -/jetty-9.3.0.v20150612.tar.gz -/jetty-9.3.1.v20150714.tar.gz -/jetty-9.3.2.v20150730.tar.gz -/jetty-9.3.3.v20150827.tar.gz -/jetty-9.3.4.v20151007.tar.gz -/jetty-9.3.6.v20151106.tar.gz -/jetty-9.3.7.RC0.tar.gz -/jetty-9.3.7.RC1.tar.gz -/jetty-9.3.7.v20160115.tar.gz -/jetty-9.3.8.RC0.tar.gz -/jetty-9.3.8.v20160314.tar.gz -/jetty-9.3.9.M0.tar.gz -/jetty-9.3.10.M0.tar.gz -/jetty-9.4.0.M0.tar.gz -/jetty-9.4.0.RC0.tar.gz -/jetty-9.4.0.RC2.tar.gz -/jetty-9.4.0.v20161208.tar.gz -/jetty-9.4.1.v20170120.tar.gz -/jetty-9.4.2.v20170220.tar.gz -/jetty-9.4.3.v20170317.tar.gz -/jetty-9.4.4.v20170414.tar.gz -/jetty-9.4.5.v20170502.tar.gz -/jetty-9.4.6.v20170531.tar.gz -/jetty-9.4.7.RC0.tar.gz -/jetty-9.4.7.v20170914.tar.gz -/jetty-9.4.8.v20171121.tar.gz -/jetty-9.4.9.v20180320.tar.gz -/jetty-9.4.10.RC1.tar.gz -/jetty-9.4.10.v20180503.tar.gz -/jetty-9.4.11.v20180605.tar.gz -/jetty-9.4.14.v20181114.tar.gz -/jetty-9.4.15.v20190215.tar.gz -/jetty-9.4.17.v20190418.tar.gz -/jetty-9.4.18.v20190429.tar.gz -/jetty-9.4.19.v20190610.tar.gz -/jetty-9.4.20.v20190813.tar.gz -/jetty-9.4.24.v20191120.tar.gz -/jetty-9.4.27.v20200227.tar.gz -/jetty-9.4.30.v20200611.tar.gz -/jetty-9.4.31.v20200723.tar.gz -/jetty-9.4.33.v20201020.tar.gz -/jetty-9.4.36.v20210114.tar.gz -/jetty-9.4.38.v20210224.tar.gz diff --git a/0001-Distro-jetty.home.patch b/0001-Distro-jetty.home.patch deleted file mode 100644 index 269e227..0000000 --- a/0001-Distro-jetty.home.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 29d160bf916b4ab358a01496029f9aaa5fba66b3 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Mon, 9 Sep 2019 12:42:10 +0100 -Subject: [PATCH 1/2] Distro jetty.home - ---- - .../org/eclipse/jetty/start/config/CommandLineConfigSource.java | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java -index 30440c4..cb0ed3d 100644 ---- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java -+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java -@@ -120,6 +120,8 @@ public class CommandLineConfigSource implements ConfigSource - try - { - Path home = new File(new URI(m.group(1))).getParentFile().toPath(); -+ if (home.endsWith("/usr/share/java/jetty")) -+ home = new File(home.toString().replaceAll("java/jetty$", "jetty")).toPath(); - setProperty(BaseHome.JETTY_HOME, home.toString(), ORIGIN_INTERNAL_FALLBACK); - return home; - } --- -2.26.2 - diff --git a/0002-Port-to-servlet-api-4-5.patch b/0002-Port-to-servlet-api-4-5.patch deleted file mode 100644 index 5078549..0000000 --- a/0002-Port-to-servlet-api-4-5.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 65b5de2ef9ffc5eacb23c6c4834cc1c513f0eafa Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Wed, 19 Aug 2020 13:14:37 +0100 -Subject: [PATCH 2/2] Port to servlet-api 4/5 - ---- - .../jetty/server/handler/ContextHandler.java | 46 +++++++++++++++++++ - 1 file changed, 46 insertions(+) - -diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java -index 7960b0f..4981755 100644 ---- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java -+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java -@@ -2760,6 +2760,13 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu - return null; - } - -+ public ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) -+ { -+ // TODO new in 4.0 -+ LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "addJspFile(String, String)"); -+ return null; -+ } -+ - @Override - public javax.servlet.ServletRegistration.Dynamic addServlet(String servletName, Class servletClass) - { -@@ -2930,6 +2937,45 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu - { - return null; - } -+ -+ public int getSessionTimeout() -+ { -+ // TODO new in 4.0 -+ LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "getSessionTimeout()"); -+ return 0; -+ } -+ -+ public void setSessionTimeout(int sessionTimeout) -+ { -+ // TODO new in 4.0 -+ LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "setSessionTimeout(int)"); -+ } -+ -+ public String getRequestCharacterEncoding() -+ { -+ // TODO new in 4.0 -+ LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "getRequestCharacterEncoding()"); -+ return null; -+ } -+ -+ public void setRequestCharacterEncoding(String encoding) -+ { -+ // TODO new in 4.0 -+ LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "setRequestCharacterEncoding(String)"); -+ } -+ -+ public String getResponseCharacterEncoding() -+ { -+ // TODO new in 4.0 -+ LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "getResponseCharacterEncoding()"); -+ return null; -+ } -+ -+ public void setResponseCharacterEncoding(String encoding) -+ { -+ // TODO new in 4.0 -+ LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "setResponseCharacterEncoding(String)"); -+ } - } - - /** --- -2.26.2 - diff --git a/LICENSE-MIT b/LICENSE-MIT deleted file mode 100644 index 30a4628..0000000 --- a/LICENSE-MIT +++ /dev/null @@ -1,10 +0,0 @@ -Copyright (c) 2008-2009 Bjoern Hoehrmann -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5d7f177 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +jetty package is retired on c9s for CS-686 diff --git a/jetty.logrotate b/jetty.logrotate deleted file mode 100644 index 9d98d0b..0000000 --- a/jetty.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/jetty/jetty-console.log { - copytruncate - weekly - rotate 52 - compress - missingok -} diff --git a/jetty.service b/jetty.service deleted file mode 100644 index ae69ebf..0000000 --- a/jetty.service +++ /dev/null @@ -1,18 +0,0 @@ -# Systemd unit file for jetty -# -# Multiple copies of this service (i.e. multiple concurrently running -# jetty servers) are not supported right now. Expect this to come with -# future updates - -[Unit] -Description=Jetty Web Application Server -After=syslog.target network.target - -[Service] -Type=simple -ExecStart=/usr/share/jetty/bin/jetty.sh -User=jetty -Group=jetty - -[Install] -WantedBy=multi-user.target diff --git a/jetty.sh b/jetty.sh deleted file mode 100644 index b69084b..0000000 --- a/jetty.sh +++ /dev/null @@ -1,135 +0,0 @@ -#!/usr/bin/env bash -# Configuration files -# -# /etc/default/jetty -# If it exists, this is read at the start of script. It may perform any -# sequence of shell commands, like setting relevant environment variables. -# -# /etc/jetty.conf -# If found, and no configurations were given on the command line, -# the file will be used as this script's configuration. -# Each line in the file may contain: -# - A comment denoted by the pound (#) sign as first non-blank character. -# - The path to a regular file, which will be passed to jetty as a -# config.xml file. -# - The path to a directory. Each *.xml file in the directory will be -# passed to jetty as a config.xml file. -# - All other lines will be passed, as-is to the start.jar -# -# The files will be checked for existence before being passed to jetty. -# -# Configuration variables -# -# JAVA -# Command to invoke Java. If not set, java (from the PATH) will be used. -# -# JAVA_OPTIONS -# Extra options to pass to the JVM -# -# JETTY_HOME -# Where Jetty is installed. If not set, the script will try go -# guess it by first looking at the invocation path for the script, -# and then by looking in standard locations as $HOME/opt/jetty -# and /opt/jetty. The java system property "jetty.home" will be -# set to this value for use by configure.xml files, f.e.: -# -# /webapps/jetty.war -# -# JETTY_BASE -# Where your Jetty base directory is. If not set, the value from -# $JETTY_HOME will be used. -# -# JETTY_ARGS -# The default arguments to pass to jetty. -# For example -# JETTY_ARGS=jetty.port=8080 jetty.spdy.port=8443 jetty.secure.port=443 -# - -set -e -C - -readConfig() -{ - echo "Reading $1.." - source "$1" -} - -CONFIGS=() - -if [ -f /etc/default/jetty ]; then - readConfig /etc/default/jetty -fi - -if [ -z "$JETTY_HOME" ]; then - JETTY_HOME=/usr/share/jetty -fi - -if [ -z "$JETTY_BASE" ]; then - JETTY_BASE="$JETTY_HOME" -fi - -cd "$JETTY_BASE" -JETTY_BASE="$PWD" - -if [ -z "$JETTY_CONF" ] -then - JETTY_CONF=/etc/jetty.conf -fi - -if [ -f "$JETTY_CONF" ] && [ -r "$JETTY_CONF" ] -then - while read -r CONF - do - if expr "$CONF" : '#' >/dev/null ; then - continue - fi - - if [ -d "$CONF" ] - then - # assume it's a directory with configure.xml files - # for example: /etc/jetty.d/ - # sort the files before adding them to the list of JETTY_ARGS - for XMLFILE in "$CONF/"*.xml - do - if [ -r "$XMLFILE" ] && [ -f "$XMLFILE" ] - then - JETTY_ARGS+=("$XMLFILE") - else - echo "** WARNING: Cannot read '$XMLFILE' specified in '$JETTY_CONF'" - fi - done - else - # assume it's a command line parameter (let start.jar deal with its validity) - JETTY_ARGS+=("$CONF") - fi - done < "$JETTY_CONF" -fi - -if [ -z "$JAVA" ] -then - . /usr/share/java-utils/java-functions - set_jvm - set_javacmd - JAVA="$JAVACMD" -fi - -if [ -z "$JETTY_LOGS" ] && [ -d $JETTY_BASE/logs ] -then - JETTY_LOGS=/var/log/jetty/logs -fi -JAVA_OPTIONS+=("-Djetty.logs=$JETTY_LOGS") - -JAVA_OPTIONS+=("-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE") - -JETTY_START="$JETTY_HOME/start.jar" -START_INI="$JETTY_BASE/start.ini" -if [ ! -f "$START_INI" ] -then - echo "Cannot find a start.ini in your JETTY_BASE directory: $JETTY_BASE" 2>&2 - exit 1 -fi - -RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$JETTY_START" ${JETTY_ARGS[*]}) -RUN_CMD=("$JAVA" ${RUN_ARGS[@]}) - -echo -n "Starting Jetty: " -${RUN_CMD[*]} diff --git a/jetty.spec b/jetty.spec deleted file mode 100644 index 5c4fdc2..0000000 --- a/jetty.spec +++ /dev/null @@ -1,1764 +0,0 @@ -# Copyright (c) 2000-2007, 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 jtuid 110 -%global username %{name} -%global confdir %{_sysconfdir}/%{name} -%global logdir %{_localstatedir}/log/%{name} -%global homedir %{_datadir}/%{name} -%global jettycachedir %{_localstatedir}/cache/%{name} -%global tempdir %{jettycachedir}/temp -%global rundir %{_localstatedir}/run/%{name} -%global jettylibdir %{_localstatedir}/lib/%{name} -%global appdir %{jettylibdir}/webapps - - -%global addver .v20210224 - -# minimal version required to build eclipse and thermostat -# eclipse needs: util, server, http, continuation, io, security, servlet -# thermostat needs: server, jaas, webapp -# above modules need: jmx, xml -%bcond_without jp_minimal - -Name: jetty -Version: 9.4.38 -Release: 2%{?dist} -Summary: Java Webserver and Servlet Container - -# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt -License: ASL 2.0 or EPL-1.0 -URL: http://www.eclipse.org/jetty/ -Source0: https://github.com/eclipse/%{name}.project/archive/%{name}-%{version}%{addver}.tar.gz -Source1: jetty.sh -Source3: jetty.logrotate -Source5: %{name}.service -# MIT license text taken from Utf8Appendable.java -Source6: LICENSE-MIT - -Patch1: 0001-Distro-jetty.home.patch -Patch2: 0002-Port-to-servlet-api-4-5.patch - -BuildRequires: maven-local -BuildRequires: mvn(javax.servlet:javax.servlet-api) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.slf4j:slf4j-api) - -%if %{without jp_minimal} -BuildRequires: maven-local -BuildRequires: mvn(com.github.jnr:jnr-unixsocket) -BuildRequires: mvn(javax.annotation:javax.annotation-api) -BuildRequires: mvn(javax.enterprise:cdi-api) -BuildRequires: mvn(javax.servlet:javax.servlet-api) -BuildRequires: mvn(javax.servlet.jsp:javax.servlet.jsp-api) -BuildRequires: mvn(javax.servlet:jstl) -BuildRequires: mvn(javax.transaction:javax.transaction-api) -BuildRequires: mvn(javax.websocket:javax.websocket-api) -BuildRequires: mvn(javax.websocket:javax.websocket-client-api) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.ant:ant-launcher) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-war-plugin) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-api) -BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer) -BuildRequires: mvn(org.apache.taglibs:taglibs-standard-impl) -BuildRequires: mvn(org.apache.taglibs:taglibs-standard-spec) -BuildRequires: mvn(org.apache.tomcat:tomcat-jasper) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) -BuildRequires: mvn(org.eclipse.jetty.alpn:alpn-api) -BuildRequires: mvn(org.eclipse.jetty.orbit:javax.mail.glassfish) -BuildRequires: mvn(org.eclipse.jetty.orbit:javax.security.auth.message) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-assembly-descriptors) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-schemas) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-helper) -BuildRequires: mvn(org.jboss.weld.servlet:weld-servlet-core) -BuildRequires: mvn(org.mongodb:mongo-java-driver) -BuildRequires: mvn(org.ow2.asm:asm) -BuildRequires: mvn(org.ow2.asm:asm-commons) -BuildRequires: mvn(org.slf4j:slf4j-api) - -BuildRequires: mvn(org.mortbay.jetty.alpn:alpn-boot) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-distribution-remote-resources) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-policy) -#BuildRequires: mvn(org.eclipse.jetty.toolchain.setuid:jetty-setuid-java) -BuildRequires: maven-javadoc-plugin -BuildRequires: glassfish-el -BuildRequires: systemd -BuildRequires: junit5 - -# duplicate providers, choose one -BuildRequires: jboss-websocket-1.0-api -Requires: jboss-websocket-1.0-api -%endif - -BuildArch: noarch - -# jp_minimal doesn't have main package -%if %{without jp_minimal} -# Explicit requires for javapackages-tools since jetty.sh script -# uses /usr/share/java-utils/java-functions -Requires: javapackages-tools -Requires: %{name}-annotations = %{version}-%{release} -Requires: %{name}-ant = %{version}-%{release} -Requires: %{name}-client = %{version}-%{release} -Requires: %{name}-continuation = %{version}-%{release} -Requires: %{name}-deploy = %{version}-%{release} -Requires: %{name}-fcgi-client = %{version}-%{release} -Requires: %{name}-fcgi-server = %{version}-%{release} -Requires: %{name}-http = %{version}-%{release} -Requires: %{name}-http-spi = %{version}-%{release} -Requires: %{name}-io = %{version}-%{release} -Requires: %{name}-jaas = %{version}-%{release} -Requires: %{name}-jaspi = %{version}-%{release} -Requires: %{name}-jmx = %{version}-%{release} -Requires: %{name}-jndi = %{version}-%{release} -Requires: %{name}-jsp = %{version}-%{release} -Requires: %{name}-jspc-maven-plugin = %{version}-%{release} -Requires: %{name}-maven-plugin = %{version}-%{release} -Requires: %{name}-plus = %{version}-%{release} -Requires: %{name}-proxy = %{version}-%{release} -Requires: %{name}-rewrite = %{version}-%{release} -Requires: %{name}-security = %{version}-%{release} -Requires: %{name}-server = %{version}-%{release} -Requires: %{name}-servlet = %{version}-%{release} -Requires: %{name}-servlets = %{version}-%{release} -Requires: %{name}-start = %{version}-%{release} -Requires: %{name}-unixsocket = %{version}-%{release} -Requires: %{name}-util = %{version}-%{release} -Requires: %{name}-util-ajax = %{version}-%{release} -Requires: %{name}-webapp = %{version}-%{release} -Requires: %{name}-xml = %{version}-%{release} -Requires: %{name}-cdi = %{version}-%{release} -Requires: %{name}-websocket-api = %{version}-%{release} -Requires: %{name}-websocket-client = %{version}-%{release} -Requires: %{name}-websocket-common = %{version}-%{release} -Requires: %{name}-websocket-server = %{version}-%{release} -Requires: %{name}-websocket-servlet = %{version}-%{release} -Requires: %{name}-javax-websocket-client-impl = %{version}-%{release} -Requires: %{name}-javax-websocket-server-impl = %{version}-%{release} -Requires: %{name}-nosql = %{version}-%{release} -Requires: %{name}-quickstart = %{version}-%{release} -Requires: %{name}-jstl = %{version}-%{release} -Requires: %{name}-alpn-client = %{version}-%{release} -Requires: %{name}-alpn-server = %{version}-%{release} -Requires: %{name}-http2-client = %{version}-%{release} -Requires: %{name}-http2-common = %{version}-%{release} -Requires: %{name}-http2-hpack = %{version}-%{release} -Requires: %{name}-http2-http-client-transport = %{version}-%{release} -Requires: %{name}-http2-server = %{version}-%{release} - -Requires(pre): shadow-utils -%{?systemd_ordering} - - -Provides: group(%username) = %jtuid -Provides: user(%username) = %jtuid -%endif - -# Hazelcast in Fedora is too old for jetty to build against (Added in F29) -Obsoletes: %{name}-hazelcast < 9.4.18-1 -# Infinispan in Fedora is too old for jetty to build against (Added in F31) -Obsoletes: %{name}-infinispan < 9.4.18-1 -# Eclipse no longer available (Added in F31) -Obsoletes: %{name}-osgi-alpn < 9.4.18-1 -Obsoletes: %{name}-osgi-boot < 9.4.18-1 -Obsoletes: %{name}-osgi-boot-jsp < 9.4.18-1 -Obsoletes: %{name}-osgi-boot-warurl < 9.4.18-1 -# Spring framework removed from Fedora (Added in F32) -Obsoletes: %{name}-spring < 9.4.24-1 - -%if %{with jp_minimal} -# Remove left-over packages that would have broken deps when built in minimal mode -Obsoletes: %{name}-project < 9.4.20-1 -Obsoletes: %{name}-annotations < 9.4.20-1 -Obsoletes: %{name}-ant < 9.4.20-1 -Obsoletes: %{name}-cdi < 9.4.20-1 -Obsoletes: %{name}-deploy < 9.4.20-1 -Obsoletes: %{name}-fcgi-client < 9.4.20-1 -Obsoletes: %{name}-fcgi-server < 9.4.20-1 -Obsoletes: %{name}-http-spi < 9.4.20-1 -Obsoletes: %{name}-jaspi < 9.4.20-1 -Obsoletes: %{name}-jndi < 9.4.20-1 -Obsoletes: %{name}-jsp < 9.4.20-1 -Obsoletes: %{name}-jstl < 9.4.20-1 -Obsoletes: %{name}-jspc-maven-plugin < 9.4.20-1 -Obsoletes: %{name}-maven-plugin < 9.4.20-1 -Obsoletes: %{name}-plus < 9.4.20-1 -Obsoletes: %{name}-proxy < 9.4.20-1 -Obsoletes: %{name}-quickstart < 9.4.20-1 -Obsoletes: %{name}-rewrite < 9.4.20-1 -Obsoletes: %{name}-servlets < 9.4.20-1 -Obsoletes: %{name}-start < 9.4.20-1 -Obsoletes: %{name}-unixsocket < 9.4.20-1 -Obsoletes: %{name}-websocket-api < 9.4.20-1 -Obsoletes: %{name}-websocket-client < 9.4.20-1 -Obsoletes: %{name}-websocket-common < 9.4.20-1 -Obsoletes: %{name}-websocket-server < 9.4.20-1 -Obsoletes: %{name}-websocket-servlet < 9.4.20-1 -Obsoletes: %{name}-javax-websocket-client-impl < 9.4.20-1 -Obsoletes: %{name}-javax-websocket-server-impl < 9.4.20-1 -Obsoletes: %{name}-alpn-client < 9.4.20-1 -Obsoletes: %{name}-alpn-server < 9.4.20-1 -Obsoletes: %{name}-http2-client < 9.4.20-1 -Obsoletes: %{name}-http2-common < 9.4.20-1 -Obsoletes: %{name}-http2-hpack < 9.4.20-1 -Obsoletes: %{name}-http2-http-client-transport < 9.4.20-1 -Obsoletes: %{name}-http2-server < 9.4.20-1 -Obsoletes: %{name}-nosql < 9.4.20-1 -%endif - -%description -%global desc \ -Jetty is a 100% Java HTTP Server and Servlet Container. This means that you\ -do not need to configure and run a separate web server (like Apache) in order\ -to use Java, servlets and JSPs to generate dynamic content. Jetty is a fully\ -featured web server for static and dynamic content. Unlike separate\ -server/container solutions, this means that your web server and web\ -application run in the same process, without interconnection overheads\ -and complications. Furthermore, as a pure java component, Jetty can be simply\ -included in your application for demonstration, distribution or deployment.\ -Jetty is available on all Java supported platforms. -%{desc} -%global extdesc %{desc}\ -\ -This package contains - -# packages in jp_minimal set -%package client -Summary: client module for Jetty - -%description client -%{extdesc} %{summary}. - -%package continuation -Summary: continuation module for Jetty - -%description continuation -%{extdesc} %{summary}. - -%package http -Summary: http module for Jetty - -%description http -%{extdesc} %{summary}. - -%package http-spi -Summary: http-spi module for Jetty - -%description http-spi -%{extdesc} %{summary}. - -%package io -Summary: io module for Jetty - -%description io -%{extdesc} %{summary}. - -%package jaas -Summary: jaas module for Jetty - -%description jaas -%{extdesc} %{summary}. - -%package jsp -Summary: jsp module for Jetty -Requires: glassfish-el - -%description jsp -%{extdesc} %{summary}. - -%package security -Summary: security module for Jetty - -%description security -%{extdesc} %{summary}. - -%package server -Summary: server module for Jetty - -%description server -%{extdesc} %{summary}. - -%package servlet -Summary: servlet module for Jetty -# Eclipse no longer available (Added in F31) -Obsoletes: %{name}-httpservice < 9.4.18-1 - -%description servlet -%{extdesc} %{summary}. - -%package util -Summary: util module for Jetty -# Utf8Appendable.java is additionally under MIT license -License: (ASL 2.0 or EPL-1.0) and MIT - -%description util -%{extdesc} %{summary}. - -%package util-ajax -Summary: util-ajax module for Jetty - -%description util-ajax -%{extdesc} %{summary}. - -%package webapp -Summary: webapp module for Jetty - -%description webapp -%{extdesc} %{summary}. - -%package jmx -Summary: jmx module for Jetty - -%description jmx -%{extdesc} %{summary}. - -%package xml -Summary: xml module for Jetty - -%description xml -%{extdesc} %{summary}. - - - -%if %{without jp_minimal} -%package project -Summary: POM files for Jetty -Obsoletes: %{name}-websocket-parent < 9.4.0-0.4 -Provides: %{name}-websocket-parent = %{version}-%{release} -Obsoletes: %{name}-osgi-project < 9.4.0-0.4 -Provides: %{name}-osgi-project = %{version}-%{release} - -%description project -%{extdesc} %{summary}. - -%package deploy -Summary: deploy module for Jetty - -%description deploy -%{extdesc} %{summary}. - -%package annotations -Summary: annotations module for Jetty - -%description annotations -%{extdesc} %{summary}. - -%package ant -Summary: ant module for Jetty - -%description ant -%{extdesc} %{summary}. - -%package cdi -Summary: Jetty CDI Configuration - -%description cdi -%{extdesc} %{summary}. - -%package fcgi-client -Summary: FastCGI client module for Jetty - -%description fcgi-client -%{extdesc} %{summary}. - -%package fcgi-server -Summary: FastCGI client module for Jetty - -%description fcgi-server -%{extdesc} %{summary}. - -%package jaspi -Summary: jaspi module for Jetty - -%description jaspi -%{extdesc} %{summary}. - -%package jndi -Summary: jndi module for Jetty - -%description jndi -%{extdesc} %{summary}. - -%package jspc-maven-plugin -Summary: jspc-maven-plugin module for Jetty - -%description jspc-maven-plugin -%{extdesc} %{summary}. - -%package maven-plugin -Summary: maven-plugin module for Jetty - -%description maven-plugin -%{extdesc} %{summary}. - -%package plus -Summary: plus module for Jetty - -%description plus -%{extdesc} %{summary}. - -%package proxy -Summary: proxy module for Jetty - -%description proxy -%{extdesc} %{summary}. - -%package rewrite -Summary: rewrite module for Jetty - -%description rewrite -%{extdesc} %{summary}. - -%package servlets -Summary: servlets module for Jetty - -%description servlets -%{extdesc} %{summary}. - -%package start -Summary: start module for Jetty - -%description start -%{extdesc} %{summary}. - -%package unixsocket -Summary: unixsocket module for Jetty - -%description unixsocket -%{extdesc} %{summary}. - -%package websocket-api -Summary: websocket-api module for Jetty - -%description websocket-api -%{extdesc} %{summary}. - -%package websocket-client -Summary: websocket-client module for Jetty - -%description websocket-client -%{extdesc} %{summary}. - -%package websocket-common -Summary: websocket-common module for Jetty - -%description websocket-common -%{extdesc} %{summary}. - -%package websocket-server -Summary: websocket-server module for Jetty - -%description websocket-server -%{extdesc} %{summary}. - -%package websocket-servlet -Summary: websocket-servlet module for Jetty - -%description websocket-servlet -%{extdesc} %{summary}. - -%package javax-websocket-client-impl -Summary: javax-websocket-client-impl module for Jetty - -%description javax-websocket-client-impl -%{extdesc} %{summary}. - -%package javax-websocket-server-impl -Summary: javax-websocket-server-impl module for Jetty - -%description javax-websocket-server-impl -%{extdesc} %{summary}. - -%package nosql -Summary: nosql module for Jetty - -%description nosql -%{extdesc} %{summary}. - -%package quickstart -Summary: quickstart module for Jetty - -%description quickstart -%{extdesc} %{summary}. - -%package alpn-client -Summary: alpn-client module for Jetty - -%description alpn-client -%{extdesc} %{summary}. - -%package alpn-server -Summary: alpn-server module for Jetty - -%description alpn-server -%{extdesc} %{summary}. - -%package http2-client -Summary: http2-client module for Jetty - -%description http2-client -%{extdesc} %{summary}. - -%package http2-common -Summary: http2-common module for Jetty - -%description http2-common -%{extdesc} %{summary}. - -%package http2-hpack -Summary: http2-hpack module for Jetty - -%description http2-hpack -%{extdesc} %{summary}. - -%package http2-http-client-transport -Summary: http2-http-client-transport module for Jetty - -%description http2-http-client-transport -%{extdesc} %{summary}. - -%package http2-server -Summary: http2-server module for Jetty - -%description http2-server -%{extdesc} %{summary}. - -%package jstl -Summary: jstl module for Jetty - -%description jstl -%{extdesc} %{summary}. - -%endif - -%package javadoc -Summary: Javadoc for %{name} -# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc -License: (ASL 2.0 or EPL-1.0) and MIT - -%description javadoc -%{summary}. - -%prep -%setup -q -n %{name}.project-%{name}-%{version}%{addver} - -%patch1 -p1 -%patch2 -p1 - -find . -name "*.?ar" -exec rm {} \; -find . -name "*.class" -exec rm {} \; - -# Plugins irrelevant or harmful to building the package -%pom_remove_plugin -r :maven-checkstyle-plugin -%pom_remove_plugin -r :spotbugs-maven-plugin -%pom_remove_plugin -r :maven-enforcer-plugin -%pom_remove_plugin -r :maven-eclipse-plugin -%pom_remove_plugin -r :license-maven-plugin -%pom_remove_plugin -r :maven-site-plugin -%pom_remove_plugin -r :maven-source-plugin -%pom_remove_plugin -r :maven-deploy-plugin -%pom_remove_plugin -r :jacoco-maven-plugin -%pom_remove_plugin -r :maven-release-plugin -%pom_remove_plugin -r :buildnumber-maven-plugin -%pom_remove_plugin -r :h2spec-maven-plugin - -# Unnecessary pom flattening can be skipped -%pom_remove_plugin -r :flatten-maven-plugin jetty-bom - -%pom_disable_module aggregates/jetty-all - -# Reflective use of classes that might not be present in the JDK should be optional OSGi-wise -%pom_xpath_inject "pom:configuration/pom:instructions" \ -"sun.misc;resolution:=optional,com.sun.nio.file;resolution:=optional,*" - -%pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi - -%pom_change_dep -r org.mortbay.jasper:apache-jsp org.apache.tomcat:tomcat-jasper - -%pom_add_dep 'org.junit.jupiter:junit-jupiter-engine:${junit.version}' tests/test-sessions/test-sessions-common - -# provided by glassfish-jsp-api that has newer version -%pom_change_dep -r javax.servlet.jsp:jsp-api javax.servlet.jsp:javax.servlet.jsp-api - -# txt artifact - not installable -%pom_remove_plugin ":jetty-version-maven-plugin" -%pom_xpath_remove "pom:artifactItem[pom:classifier='version']" jetty-home - -# Disable building source release -%pom_xpath_remove 'pom:execution[pom:id="sources"]' jetty-home - -# Unwanted JS in javadoc -sed -i '/^\s*\*.*