diff --git a/.gitignore b/.gitignore index 3f86a1a..d1cd688 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ jetty-6.1.26-src.zip /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 diff --git a/jetty.spec b/jetty.spec index 8d36d16..a6c34f4 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver v20170120 +%global addver v20170220 %bcond_without infinispan %bcond_without spring @@ -49,8 +49,8 @@ %bcond_without weld Name: jetty -Version: 9.4.1 -Release: 6.%{addver}%{?dist} +Version: 9.4.2 +Release: 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 @@ -664,9 +664,12 @@ find . -name "*.class" -exec rm {} \; %pom_remove_plugin ":jetty-version-maven-plugin" %pom_xpath_remove "pom:artifactItem[pom:classifier='version']" jetty-home -# javascript not allowed in javadoc +# Remove google analytics from javadoc %pom_xpath_remove 'pom:plugin[pom:artifactId="maven-javadoc-plugin"]/pom:configuration/pom:header' +# Unwanted JS in javadoc +sed -i '/^\s*\*.*