diff --git a/.gitignore b/.gitignore index 3e29575..26c454d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ jetty-6.1.26-src.zip /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 diff --git a/jetty.spec b/jetty.spec index ae02319..cc1b476 100644 --- a/jetty.spec +++ b/jetty.spec @@ -53,8 +53,8 @@ %endif Name: jetty -Version: 9.3.9 -Release: 0.2.%{addver}%{?dist} +Version: 9.3.10 +Release: 0.1%{addver}%{?dist} Summary: Java Webserver and Servlet Container # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt @@ -648,6 +648,9 @@ sed -i 's#;##' jetty-http2/http2-common/pom.xm %pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-spec-webapp']]" jetty-distribution/pom.xml %pom_remove_plugin :maven-dependency-plugin jetty-http2/http2-http-client-transport/pom.xml +# We don't have asciidoctor-maven-plugin +%pom_disable_module jetty-documentation + # Missing jars (jetty-setuid-java-1.0.0.jar,jetty-setuid-java-1.0.0-config.jar) %pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-distribution/pom.xml # test-jaas-webapp artifact is disabled @@ -984,6 +987,9 @@ exit 0 %doc NOTICE.txt LICENSE* %changelog +* Wed Jun 01 2016 Michael Simacek - 9.3.10-0.1.M0 +- Update to upstream version 9.3.10.M0 + * Tue May 31 2016 Mikolaj Izdebski - 9.3.9-0.2.M0 - Fix build issue with maven-jar-plugin 3.0.0 diff --git a/sources b/sources index d413a31..ff4834b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27d603acd0c174dbef5bf5e6629cf3d2 jetty-9.3.9.M0.tar.gz +0319dca85034b578780dcdc46e20fabd jetty-9.3.10.M0.tar.gz