Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

examples/async-rest/async-rest-jar/pom.xml

@@ -1,18 +1,21 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>example-async-rest</artifactId>
     <version>10.0.0-SNAPSHOT</version>
   </parent>  
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.example-async-rest</groupId>
   <artifactId>example-async-rest-jar</artifactId>
   <packaging>jar</packaging>
   <name>Example Async Rest :: Jar</name>
-  <url>http://www.eclipse.org/jetty</url>
+
   <properties>
-    <bundle-symbolic-name>${project.groupId}.examples.async.rest</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.parent.groupId}.examples.async.rest</bundle-symbolic-name>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

examples/async-rest/async-rest-server/pom.xml

@@ -1,14 +1,21 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>example-async-rest</artifactId>
     <version>10.0.0-SNAPSHOT</version>
-  </parent>  
+  </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.example-async-rest</groupId>
   <artifactId>example-async-rest-server</artifactId>
   <packaging>jar</packaging>
   <name>Example Async Rest :: Server</name>
+
+  <properties>
+    <bundle-symbolic-name>${project.parent.groupId}.examples.async.rest.server</bundle-symbolic-name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

examples/async-rest/async-rest-webapp/pom.xml

@@ -1,17 +1,21 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>example-async-rest</artifactId>
     <version>10.0.0-SNAPSHOT</version>
   </parent>  
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.example-async-rest</groupId>
   <artifactId>example-async-rest-webapp</artifactId>
   <packaging>war</packaging>
   <name>Example Async Rest :: Webapp</name>
+
   <build>
     <finalName>async-rest</finalName>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.example-async-rest</groupId>

examples/async-rest/pom.xml

@@ -1,18 +1,21 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.eclipse.jetty.examples</groupId>
     <artifactId>examples-parent</artifactId>
     <version>10.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>example-async-rest</artifactId>
   <packaging>pom</packaging>
   <name>Example Async Rest</name>
+
   <modules>
     <module>async-rest-jar</module>
     <module>async-rest-webapp</module>
     <module>async-rest-server</module>
   </modules>
+
 </project>

examples/pom.xml

@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
     <version>10.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.examples</groupId>
   <artifactId>examples-parent</artifactId>
   <name>Jetty Examples :: Parent</name>
   <packaging>pom</packaging>
+
   <properties>
     <sonar.skip>true</sonar.skip>
   </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -26,6 +29,7 @@
       </plugin>
     </plugins>
   </build>
+
   <modules>
     <!--
     - The async-rest and embedded are examples that have historical locations,

jetty-osgi/jetty-osgi-alpn/pom.xml

@@ -12,7 +12,7 @@
   <name>Jetty :: OSGi ALPN Fragment</name>
   <packaging>jar</packaging>
   <properties>
-    <bundle-symbolic-name>org.eclipse.jetty.osgi.alpn.fragment</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.alpn.fragment</bundle-symbolic-name>
   </properties>
   <build>
     <plugins>

tests/jetty-jmh/pom.xml

@@ -1,14 +1,20 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>tests-parent</artifactId>
     <version>10.0.0-SNAPSHOT</version>
   </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jmh</artifactId>
   <name>Jetty :: Jmh</name>
   <description>Jmh classes for Jetty</description>
-  <url>http://www.eclipse.org/jetty</url>
+
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.jmh</bundle-symbolic-name>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -39,8 +45,7 @@
               <finalName>${jmhjar.name}</finalName>
               <shadeTestJar>true</shadeTestJar>
               <transformers>
-                <transformer
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>org.openjdk.jmh.Main</mainClass>
                 </transformer>
               </transformers>
@@ -72,6 +77,7 @@
       </plugins>
     </pluginManagement>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>