From 9b5f8abe2cf3195892b63273c88baf06ab97f464 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 12 2020 09:19:50 +0000 Subject: import jetty-9.4.30-2.v20200611.module+el8.2.1+7436+4afdca1f --- diff --git a/.gitignore b/.gitignore index daf711e..9c29f6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jetty-9.4.27.v20200227.tar.gz +SOURCES/jetty-9.4.30.v20200611.tar.gz diff --git a/.jetty.metadata b/.jetty.metadata index fe4e710..37535f8 100644 --- a/.jetty.metadata +++ b/.jetty.metadata @@ -1 +1 @@ -7d0b929a211cd52fc91acd33cce93679a9e75d9f SOURCES/jetty-9.4.27.v20200227.tar.gz +45ff99f15d38a07462f614dfaffbd578ba91de3a SOURCES/jetty-9.4.30.v20200611.tar.gz diff --git a/SPECS/jetty.spec b/SPECS/jetty.spec index 3f54f2f..a0d0132 100644 --- a/SPECS/jetty.spec +++ b/SPECS/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver .v20200227 +%global addver .v20200611 # minimal version required to build eclipse and thermostat # eclipse needs: util, server, http, continuation, io, security, servlet @@ -49,8 +49,8 @@ %bcond_without jp_minimal Name: jetty -Version: 9.4.27 -Release: 1%{addver}%{?dist} +Version: 9.4.30 +Release: 2%{addver}%{?dist} Summary: Java Webserver and Servlet Container # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt @@ -267,6 +267,7 @@ Jetty is available on all Java supported platforms. This package contains # packages in jp_minimal set + %package client Summary: client module for Jetty @@ -359,6 +360,7 @@ Summary: xml module for Jetty %if %{without jp_minimal} + %package project Summary: POM files for Jetty Obsoletes: %{name}-websocket-parent < 9.4.0-0.4 @@ -891,25 +893,38 @@ exit 0 %endif %files client -f .mfiles-jetty-client + %files continuation -f .mfiles-jetty-continuation + %files jaas -f .mfiles-jetty-jaas + %files io -f .mfiles-jetty-io + %files server -f .mfiles-jetty-server + %files servlet -f .mfiles-jetty-servlet + %files util -f .mfiles-jetty-util %license LICENSE NOTICE.txt LICENSE-MIT + %files webapp -f .mfiles-jetty-webapp + %files jmx -f .mfiles-jetty-jmx + %files xml -f .mfiles-jetty-xml + %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 %config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name} @@ -929,40 +944,75 @@ exit 0 %license LICENSE NOTICE.txt LICENSE-MIT %files annotations -f .mfiles-jetty-annotations + %files ant -f .mfiles-jetty-ant + %files cdi -f .mfiles-jetty-cdi + %files deploy -f .mfiles-jetty-deploy + %files fcgi-client -f .mfiles-fcgi-client + %files fcgi-server -f .mfiles-fcgi-server + %files http-spi -f .mfiles-jetty-http-spi + %files jaspi -f .mfiles-jetty-jaspi + %files jndi -f .mfiles-jetty-jndi + %files jsp -f .mfiles-jetty-jsp + %files jstl -f .mfiles-apache-jstl + %files jspc-maven-plugin -f .mfiles-jetty-jspc-maven-plugin + %files maven-plugin -f .mfiles-jetty-maven-plugin + %files plus -f .mfiles-jetty-plus + %files proxy -f .mfiles-jetty-proxy + %files quickstart -f .mfiles-jetty-quickstart + %files rewrite -f .mfiles-jetty-rewrite + %files servlets -f .mfiles-jetty-servlets + %files start -f .mfiles-jetty-start + %files unixsocket -f .mfiles-jetty-unixsocket + %files util-ajax -f .mfiles-jetty-util-ajax + %files websocket-api -f .mfiles-websocket-api + %files websocket-client -f .mfiles-websocket-client + %files websocket-common -f .mfiles-websocket-common + %files websocket-server -f .mfiles-websocket-server + %files websocket-servlet -f .mfiles-websocket-servlet + %files javax-websocket-client-impl -f .mfiles-javax-websocket-client-impl + %files javax-websocket-server-impl -f .mfiles-javax-websocket-server-impl + %files alpn-client -f .mfiles-jetty-alpn-client + %files alpn-server -f .mfiles-jetty-alpn-server + %files http2-client -f .mfiles-http2-client + %files http2-common -f .mfiles-http2-common + %files http2-hpack -f .mfiles-http2-hpack + %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 @@ -970,6 +1020,12 @@ exit 0 %license LICENSE NOTICE.txt LICENSE-MIT %changelog +* Fri Jul 10 2020 Jiri Vanek - 9.4.30-2.v20200611 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 18 2020 Mat Booth - 9.4.30-1.v20200611 +- Update to latest upstream release + * Fri Mar 20 2020 Mat Booth - 9.4.27-1.v20200227 - Update to latest upstream release