diff --git a/.gitignore b/.gitignore index 115c1db..fbab2db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,10 @@ +jetty-5.1.12.fedora.zip +jetty-5.1.14.fedora.tgz +jetty-5.1.15.fedora.tgz +jetty-6.1.20-src.zip +jetty-6.1.21-src.zip +jetty-6.1.24-src.zip +jetty-6.1.26-src.zip /jetty-8.1.0.RC4.tar.bz2 /jetty-8.1.0.RC5.tar.bz2 /jetty-8.1.0.v20120127.tar.bz2 @@ -56,16 +63,3 @@ /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 -/jetty-9.4.40.v20210413.tar.gz diff --git a/0001-Distro-jetty.home.patch b/0001-Fedora-jetty.home.patch similarity index 60% rename from 0001-Distro-jetty.home.patch rename to 0001-Fedora-jetty.home.patch index 269e227..90b4743 100644 --- a/0001-Distro-jetty.home.patch +++ b/0001-Fedora-jetty.home.patch @@ -1,25 +1,26 @@ -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 +From 46f7ec33b83c28459496739f4d8b91329fb82bc6 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 2 Jun 2015 22:52:21 +0200 +Subject: [PATCH 1/2] Fedora jetty.home --- - .../org/eclipse/jetty/start/config/CommandLineConfigSource.java | 2 ++ - 1 file changed, 2 insertions(+) + .../eclipse/jetty/start/config/CommandLineConfigSource.java | 3 +++ + 1 file changed, 3 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 +index f0c9e07..7d2ee3e 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 +@@ -120,6 +120,9 @@ 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); ++ + setProperty(BaseHome.JETTY_HOME,home.toString(),ORIGIN_INTERNAL_FALLBACK); return home; } -- -2.26.2 +2.19.1 diff --git a/0002-Allow-building-with-ASM6-on-Fedora-29.patch b/0002-Allow-building-with-ASM6-on-Fedora-29.patch new file mode 100644 index 0000000..3bf22f2 --- /dev/null +++ b/0002-Allow-building-with-ASM6-on-Fedora-29.patch @@ -0,0 +1,53 @@ +From 743dedbd36be295bcc4952611cc89c577ec0a693 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Thu, 6 Dec 2018 09:49:35 +0000 +Subject: [PATCH 2/2] Allow building with ASM6 on Fedora <= 29 + +--- + .../org/eclipse/jetty/annotations/AnnotationParser.java | 9 ++------- + .../eclipse/jetty/osgi/annotations/AnnotationParser.java | 2 +- + 2 files changed, 3 insertions(+), 8 deletions(-) + +diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java +index a23b685..832ae20 100644 +--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java ++++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java +@@ -69,8 +69,8 @@ import org.objectweb.asm.Opcodes; + public class AnnotationParser + { + private static final Logger LOG = Log.getLogger(AnnotationParser.class); +- private static final int ASM_OPCODE_VERSION = Opcodes.ASM7; //compatibility of api +- private static final String ASM_OPCODE_VERSION_STR = "ASM7"; ++ private static final int ASM_OPCODE_VERSION = Opcodes.ASM6; //compatibility of api ++ private static final String ASM_OPCODE_VERSION_STR = "ASM6"; + + /** + * Map of classnames scanned and the first location from which scan occurred +@@ -115,11 +115,6 @@ public class AnnotationParser + asmVersion = Opcodes.ASM6; + break; + } +- case 7: +- { +- asmVersion = Opcodes.ASM7; +- break; +- } + default: + { + LOG.warn("Unrecognized ASM version, assuming {}", ASM_OPCODE_VERSION_STR); +diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java +index 00f0919..1350eb4 100644 +--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java ++++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java +@@ -49,7 +49,7 @@ public class AnnotationParser extends org.eclipse.jetty.annotations.AnnotationPa + + public AnnotationParser(int javaPlatform) + { +- super(javaPlatform, Opcodes.ASM7); ++ super(javaPlatform, Opcodes.ASM6); + } + + /** +-- +2.19.1 + 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/jetty.spec b/jetty.spec index 1306fdf..15b7dea 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,22 +40,21 @@ %global appdir %{jettylibdir}/webapps -%global addver .v20210413 +%global addver .v20181114 # 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.40 -Release: 17%{?dist} +Version: 9.4.14 +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 -# Automatically converted from old format: ASL 2.0 or EPL-1.0 - review is highly recommended. -License: Apache-2.0 OR EPL-1.0 +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 @@ -64,10 +63,10 @@ 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 +Patch1: 0001-Fedora-jetty.home.patch +Patch2: 0002-Allow-building-with-ASM6-on-Fedora-29.patch -BuildRequires: maven-local-openjdk25 +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) @@ -75,7 +74,7 @@ BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.slf4j:slf4j-api) %if %{without jp_minimal} -BuildRequires: maven-local-openjdk25 +BuildRequires: maven-local BuildRequires: mvn(com.github.jnr:jnr-unixsocket) BuildRequires: mvn(javax.annotation:javax.annotation-api) BuildRequires: mvn(javax.enterprise:cdi-api) @@ -108,17 +107,22 @@ 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.equinox.http:servlet) 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.eclipse.osgi:org.eclipse.osgi) +BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi.services) +BuildRequires: mvn(org.infinispan:infinispan-core) 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.springframework:spring-beans) BuildRequires: mvn(org.mortbay.jetty.alpn:alpn-boot) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources) @@ -133,10 +137,9 @@ 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 -ExclusiveArch: %{java_arches} noarch # jp_minimal doesn't have main package %if %{without jp_minimal} @@ -167,12 +170,14 @@ 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} Requires: %{name}-util-ajax = %{version}-%{release} Requires: %{name}-webapp = %{version}-%{release} Requires: %{name}-xml = %{version}-%{release} +Requires: %{name}-infinispan = %{version}-%{release} Requires: %{name}-cdi = %{version}-%{release} Requires: %{name}-websocket-api = %{version}-%{release} Requires: %{name}-websocket-client = %{version}-%{release} @@ -182,6 +187,11 @@ 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}-httpservice = %{version}-%{release} +Requires: %{name}-osgi-boot = %{version}-%{release} +Requires: %{name}-osgi-boot-warurl = %{version}-%{release} +Requires: %{name}-osgi-boot-jsp = %{version}-%{release} +Requires: %{name}-osgi-alpn = %{version}-%{release} Requires: %{name}-quickstart = %{version}-%{release} Requires: %{name}-jstl = %{version}-%{release} Requires: %{name}-alpn-client = %{version}-%{release} @@ -192,64 +202,26 @@ 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 +%endif # without jp_minimal -# 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 +Obsoletes: %{name}-manual < 9.4.0-0.4 +Obsoletes: %{name}-ajp < 9.4.0-0.4 +Obsoletes: %{name}-nested < 9.4.0-0.4 +Obsoletes: %{name}-overlay-deployer < 9.4.0-0.4 +Obsoletes: %{name}-policy < 9.4.0-0.4 +Obsoletes: %{name}-websocket-mux-extension < 9.4.0-0.4 +Obsoletes: %{name}-runner < 9.4.0-0.4 +Obsoletes: %{name}-osgi-npn < 9.4.0-0.4 +Obsoletes: %{name}-monitor < 9.4.0-0.4 -%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 +# Hazelcast in Fedora is too old for jetty to build against +Obsoletes: %{name}-hazelcast < 9.4.14-1 %description %global desc \ @@ -294,6 +266,7 @@ Summary: http-spi module for Jetty %package io Summary: io module for Jetty +Obsoletes: %{name}-websocket < 9.4.0-0.4 %description io %{extdesc} %{summary}. @@ -325,8 +298,6 @@ Summary: server module for Jetty %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}. @@ -334,18 +305,11 @@ Obsoletes: %{name}-httpservice < 9.4.18-1 %package util Summary: util module for Jetty # Utf8Appendable.java is additionally under MIT license -# Automatically converted from old format: (ASL 2.0 or EPL-1.0) and MIT - review is highly recommended. -License: (Apache-2.0 OR EPL-1.0) AND LicenseRef-Callaway-MIT +License: (ASL 2.0 or EPL) 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 @@ -413,6 +377,12 @@ Summary: FastCGI client module for Jetty %description fcgi-server %{extdesc} %{summary}. +%package infinispan +Summary: infinispan module for Jetty + +%description infinispan +%{extdesc} %{summary}. + %package jaspi Summary: jaspi module for Jetty @@ -461,6 +431,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 @@ -473,6 +449,12 @@ Summary: unixsocket module for Jetty %description unixsocket %{extdesc} %{summary}. +%package util-ajax +Summary: util-ajax module for Jetty + +%description util-ajax +%{extdesc} %{summary}. + %package websocket-api Summary: websocket-api module for Jetty @@ -521,6 +503,36 @@ Summary: nosql module for Jetty %description nosql %{extdesc} %{summary}. +%package httpservice +Summary: httpservice module for Jetty + +%description httpservice +%{extdesc} %{summary}. + +%package osgi-boot +Summary: osgi-boot module for Jetty + +%description osgi-boot +%{extdesc} %{summary}. + +%package osgi-boot-warurl +Summary: osgi-boot-warurl module for Jetty + +%description osgi-boot-warurl +%{extdesc} %{summary}. + +%package osgi-boot-jsp +Summary: osgi-boot-jsp module for Jetty + +%description osgi-boot-jsp +%{extdesc} %{summary}. + +%package osgi-alpn +Summary: osgi-alpn module for Jetty + +%description osgi-alpn +%{extdesc} %{summary}. + %package quickstart Summary: quickstart module for Jetty @@ -575,13 +587,12 @@ Summary: jstl module for Jetty %description jstl %{extdesc} %{summary}. -%endif +%endif # without jp_minimal %package javadoc Summary: Javadoc for %{name} # some MIT-licensed code (from Utf8Appendable) is used to generate javadoc -# Automatically converted from old format: (ASL 2.0 or EPL-1.0) and MIT - review is highly recommended. -License: (Apache-2.0 OR EPL-1.0) AND LicenseRef-Callaway-MIT +License: (ASL 2.0 or EPL) and MIT %description javadoc %{summary}. @@ -589,17 +600,22 @@ License: (Apache-2.0 OR EPL-1.0) AND LicenseRef-Callaway-MIT %prep %setup -q -n %{name}.project-%{name}-%{version}%{addver} -%patch -P1 -p1 -%patch -P2 -p1 +%patch1 -p1 + +# ASM 7 is only available on F30+ +%if 0%{?fedora} > 0 && 0%{?fedora} < 30 +%patch2 -p1 +%endif 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 :findbugs-maven-plugin %pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r :clirr-maven-plugin %pom_remove_plugin -r :maven-eclipse-plugin +%pom_remove_plugin -r :maven-pmd-plugin %pom_remove_plugin -r :license-maven-plugin %pom_remove_plugin -r :maven-site-plugin %pom_remove_plugin -r :maven-source-plugin @@ -609,14 +625,10 @@ find . -name "*.class" -exec rm {} \; %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,*" +# Use proper groupId for apache ant +%pom_xpath_replace "pom:groupId[text()='ant']" "org.apache.ant" jetty-ant/pom.xml %pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi @@ -640,8 +652,8 @@ sed -i '/^\s*\*.*