|
|
|
@ -40,16 +40,16 @@
|
|
|
|
|
%global appdir %{jettylibdir}/webapps
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%global addver .v20200227
|
|
|
|
|
%global addver .v20190610
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
%bcond_with jp_minimal
|
|
|
|
|
|
|
|
|
|
Name: jetty
|
|
|
|
|
Version: 9.4.27
|
|
|
|
|
Version: 9.4.19
|
|
|
|
|
Release: 1%{addver}%{?dist}
|
|
|
|
|
Summary: Java Webserver and Servlet Container
|
|
|
|
|
|
|
|
|
@ -63,7 +63,7 @@ Source5: %{name}.service
|
|
|
|
|
# MIT license text taken from Utf8Appendable.java
|
|
|
|
|
Source6: LICENSE-MIT
|
|
|
|
|
|
|
|
|
|
Patch1: 0001-Distro-jetty.home.patch
|
|
|
|
|
Patch1: 0001-Fedora-jetty.home.patch
|
|
|
|
|
|
|
|
|
|
BuildRequires: maven-local
|
|
|
|
|
BuildRequires: mvn(javax.servlet:javax.servlet-api)
|
|
|
|
@ -117,6 +117,7 @@ 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.springframework:spring-beans)
|
|
|
|
|
|
|
|
|
|
BuildRequires: mvn(org.mortbay.jetty.alpn:alpn-boot)
|
|
|
|
|
BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources)
|
|
|
|
@ -131,7 +132,7 @@ BuildRequires: junit5
|
|
|
|
|
# duplicate providers, choose one
|
|
|
|
|
BuildRequires: jboss-websocket-1.0-api
|
|
|
|
|
Requires: jboss-websocket-1.0-api
|
|
|
|
|
%endif
|
|
|
|
|
%endif # without jp_minimal
|
|
|
|
|
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
|
|
|
|
@ -164,6 +165,7 @@ Requires: %{name}-security = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-server = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-servlet = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-servlets = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-spring = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-start = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-unixsocket = %{version}-%{release}
|
|
|
|
|
Requires: %{name}-util = %{version}-%{release}
|
|
|
|
@ -195,8 +197,10 @@ Requires(pre): shadow-utils
|
|
|
|
|
|
|
|
|
|
Provides: group(%username) = %jtuid
|
|
|
|
|
Provides: user(%username) = %jtuid
|
|
|
|
|
%endif
|
|
|
|
|
%endif # without jp_minimal
|
|
|
|
|
|
|
|
|
|
# (Added in F25)
|
|
|
|
|
Obsoletes: %{name}-monitor < 9.4.0-0.4
|
|
|
|
|
# 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)
|
|
|
|
@ -206,49 +210,6 @@ 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}-util-ajax < 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 \
|
|
|
|
@ -453,6 +414,12 @@ Summary: servlets module for Jetty
|
|
|
|
|
%description servlets
|
|
|
|
|
%{extdesc} %{summary}.
|
|
|
|
|
|
|
|
|
|
%package spring
|
|
|
|
|
Summary: spring module for Jetty
|
|
|
|
|
|
|
|
|
|
%description spring
|
|
|
|
|
%{extdesc} %{summary}.
|
|
|
|
|
|
|
|
|
|
%package start
|
|
|
|
|
Summary: start module for Jetty
|
|
|
|
|
|
|
|
|
@ -573,7 +540,7 @@ Summary: jstl module for Jetty
|
|
|
|
|
%description jstl
|
|
|
|
|
%{extdesc} %{summary}.
|
|
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
%endif # without jp_minimal
|
|
|
|
|
|
|
|
|
|
%package javadoc
|
|
|
|
|
Summary: Javadoc for %{name}
|
|
|
|
@ -592,7 +559,6 @@ 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 :findbugs-maven-plugin
|
|
|
|
|
%pom_remove_plugin -r :maven-enforcer-plugin
|
|
|
|
|
%pom_remove_plugin -r :clirr-maven-plugin
|
|
|
|
@ -621,6 +587,9 @@ find . -name "*.class" -exec rm {} \;
|
|
|
|
|
|
|
|
|
|
%pom_add_dep 'org.junit.jupiter:junit-jupiter-engine:${junit.version}' tests/test-sessions/test-sessions-common
|
|
|
|
|
|
|
|
|
|
# Old version of jetty not available for tests, so use this version
|
|
|
|
|
%pom_change_dep 'org.eclipse.jetty:jetty-util' 'org.eclipse.jetty:jetty-util:${project.version}' tests/test-webapps/test-servlet-spec/test-spec-webapp
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
|
@ -674,9 +643,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
|
|
|
|
|
%pom_remove_dep :infinispan-remote-query jetty-home
|
|
|
|
|
%pom_xpath_remove "pom:execution[pom:id='unpack-infinispan-config']" jetty-home
|
|
|
|
|
|
|
|
|
|
# Springframework not available in Fedora
|
|
|
|
|
%pom_disable_module jetty-spring
|
|
|
|
|
|
|
|
|
|
# Not currently able to build tests, so can't build benchmarks
|
|
|
|
|
%pom_disable_module jetty-jmh
|
|
|
|
|
|
|
|
|
@ -720,6 +686,7 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
|
|
|
|
|
%pom_disable_module jetty-annotations
|
|
|
|
|
%pom_disable_module jetty-jndi
|
|
|
|
|
%pom_disable_module jetty-cdi
|
|
|
|
|
%pom_disable_module jetty-spring
|
|
|
|
|
%pom_disable_module jetty-proxy
|
|
|
|
|
%pom_disable_module jetty-jaspi
|
|
|
|
|
%pom_disable_module jetty-rewrite
|
|
|
|
@ -733,14 +700,12 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
|
|
|
|
|
%pom_disable_module jetty-http-spi
|
|
|
|
|
%pom_disable_module jetty-alpn
|
|
|
|
|
%pom_disable_module jetty-home
|
|
|
|
|
%pom_disable_module jetty-openid
|
|
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
%endif # with jp_minimal
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%mvn_package :jetty-home __noinstall
|
|
|
|
|
%mvn_package :jetty-distribution __noinstall
|
|
|
|
|
%mvn_package :build-resources __noinstall
|
|
|
|
|
|
|
|
|
|
# Separate package for POMs
|
|
|
|
|
%if %{without jp_minimal}
|
|
|
|
@ -888,7 +853,7 @@ exit 0
|
|
|
|
|
%systemd_postun_with_restart jetty.service
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
%endif # without jp_minimal
|
|
|
|
|
|
|
|
|
|
%files client -f .mfiles-jetty-client
|
|
|
|
|
%files continuation -f .mfiles-jetty-continuation
|
|
|
|
@ -904,11 +869,6 @@ exit 0
|
|
|
|
|
%files http -f .mfiles-jetty-http
|
|
|
|
|
%files security -f .mfiles-jetty-security
|
|
|
|
|
|
|
|
|
|
%if %{with jp_minimal}
|
|
|
|
|
%files
|
|
|
|
|
# Empty metapackage in minimal mode
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{without jp_minimal}
|
|
|
|
|
%files -f .mfiles
|
|
|
|
|
%{_tmpfilesdir}/%{name}.conf
|
|
|
|
@ -964,32 +924,13 @@ exit 0
|
|
|
|
|
%files http2-http-client-transport -f .mfiles-http2-http-client-transport
|
|
|
|
|
%files http2-server -f .mfiles-http2-server
|
|
|
|
|
%files nosql -f .mfiles-jetty-nosql
|
|
|
|
|
%endif
|
|
|
|
|
%files spring -f .mfiles-jetty-spring
|
|
|
|
|
%endif # without jp_minimal
|
|
|
|
|
|
|
|
|
|
%files javadoc -f .mfiles-javadoc
|
|
|
|
|
%license LICENSE NOTICE.txt LICENSE-MIT
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Fri Mar 20 2020 Mat Booth <mat.booth@redhat.com> - 9.4.27-1.v20200227
|
|
|
|
|
- Update to latest upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.24-3.v20191120
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Thu Dec 12 2019 Mat Booth <mat.booth@redhat.com> - 9.4.24-2.v20191120
|
|
|
|
|
- Switch to minimal build. There are too many missing deps for a full build
|
|
|
|
|
|
|
|
|
|
* Thu Nov 28 2019 Mat Booth <mat.booth@redhat.com> - 9.4.24-1.v20191120
|
|
|
|
|
- Update to latest release
|
|
|
|
|
- Drop spring module due to missing deps
|
|
|
|
|
|
|
|
|
|
* Mon Sep 02 2019 Mat Booth <mat.booth@redhat.com> - 9.4.20-1
|
|
|
|
|
- Update to latest upstream release
|
|
|
|
|
- Obsolete left-over packages that would have broken deps when built in minimal mode
|
|
|
|
|
|
|
|
|
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.19-2.v20190610
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Wed Jun 12 2019 Mat Booth <mat.booth@redhat.com> - 9.4.19-1.v20190610
|
|
|
|
|
- Update to latest upstream release
|
|
|
|
|
|
|
|
|
@ -1207,7 +1148,6 @@ exit 0
|
|
|
|
|
|
|
|
|
|
* Wed Feb 25 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.2.9-1
|
|
|
|
|
- Update to upstream version 9.2.9
|
|
|
|
|
- CVE-2015-2080
|
|
|
|
|
|
|
|
|
|
* Thu Jan 22 2015 Michael Simacek <msimacek@redhat.com> - 9.2.7-1
|
|
|
|
|
- Update to upstream version 9.2.7
|
|
|
|
|