Merge remote-tracking branch 'origin/jetty-9.4.x'

jetty-annotations/pom.xml

@@ -20,6 +20,7 @@
         <extensions>true</extensions>
             <configuration>
               <instructions>
+                <Import-Package>org.objectweb.asm;version="[5.0,7)",*</Import-Package>
                 <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability>
               </instructions>
             </configuration>

jetty-osgi/test-jetty-osgi/pom.xml

@@ -382,6 +382,19 @@
       <version>${slf4j-version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>5.0.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <version>5.0.1</version>
+      <scope>test</scope>
+    </dependency>
+    
   </dependencies>
   <build>
     <plugins>

jetty-runner/pom.xml

@@ -27,7 +27,7 @@
             </goals>
             <configuration>
               <includes>**</includes>
-              <excludes>**/MANIFEST.MF,META-INF/*.RSA,META-INF/*.DSA,META-INF/*.SF</excludes>
+              <excludes>**/MANIFEST.MF,META-INF/*.RSA,META-INF/*.DSA,META-INF/*.SF,module-info.class</excludes>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>

pom.xml

@@ -866,12 +866,12 @@
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
-        <version>5.1</version>
+        <version>6.0</version>
       </dependency>
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm-commons</artifactId>
-        <version>5.1</version>
+        <version>6.0</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>