Merge pull request #2208 from olamy/pr-2158

#2152 replace pr #2158

jetty-home/pom.xml

@@ -12,6 +12,7 @@
 
   <properties>
     <assembly-directory>${basedir}/target/jetty-home</assembly-directory>
+    <source-assembly-directory>${basedir}/target/jetty-home-sources</source-assembly-directory>
     <jetty-setuid-version>1.0.3</jetty-setuid-version>
   </properties>
 
@@ -150,6 +151,25 @@
               <outputDirectory>${assembly-directory}/lib</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty</includeGroupIds>
+              <excludeGroupIds>
+                org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
+              </excludeGroupIds>
+              <excludeArtifactIds>
+                jetty-all,apache-jsp,apache-jstl,jetty-start,jetty-spring
+              </excludeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-lib-websocket-deps</id>
             <phase>generate-resources</phase>
@@ -163,6 +183,20 @@
               <outputDirectory>${assembly-directory}/lib/websocket</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-websocket-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>javax.websocket,org.eclipse.jetty.websocket</includeGroupIds>
+              <excludeArtifactIds>javax.websocket-client-api</excludeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib/websocket</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-lib-http2-deps</id>
             <phase>generate-resources</phase>
@@ -176,6 +210,20 @@
               <outputDirectory>${assembly-directory}/lib/http2</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-http2-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.http2</includeGroupIds>
+              <includeArtifactIds>http2-hpack,http2-common,http2-server</includeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib/http2</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-lib-fcgi-deps</id>
             <phase>generate-resources</phase>
@@ -188,6 +236,19 @@
               <outputDirectory>${assembly-directory}/lib/fcgi</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-fcgi-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.fcgi</includeGroupIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib/fcgi</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-lib-spring-deps</id>
             <phase>generate-resources</phase>
@@ -201,6 +262,20 @@
               <outputDirectory>${assembly-directory}/lib/spring</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-spring-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty</includeGroupIds>
+              <includeArtifactIds>jetty-spring</includeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib/spring</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-servlet-api-deps</id>
             <phase>generate-resources</phase>
@@ -241,6 +316,20 @@
               <outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-annotations-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>javax.annotation,org.eclipse.jetty.orbit,org.ow2.asm</includeGroupIds>
+              <includeArtifactIds>javax.annotation-api,asm,asm-commons</includeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib/annotations</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-apache-jsp-deps</id>
             <phase>generate-resources</phase>
@@ -257,6 +346,23 @@
               <outputDirectory>${assembly-directory}/lib/apache-jsp</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-apache-jsp-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>
+                org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt
+              </includeGroupIds>
+              <includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <prependGroupId>true</prependGroupId>
+              <outputDirectory>${source-assembly-directory}/lib/apache-jsp</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-apache-jstl-deps</id>
             <phase>generate-resources</phase>
@@ -271,6 +377,21 @@
               <outputDirectory>${assembly-directory}/lib/apache-jstl</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-apache-jstl-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <excludeGroupIds>org.glassfish.web</excludeGroupIds>
+              <includeArtifactIds>taglibs-standard-spec,taglibs-standard-impl</includeArtifactIds>
+              <prependGroupId>true</prependGroupId>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib/apache-jstl</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-jaspi-deps</id>
             <phase>generate-resources</phase>
@@ -284,6 +405,20 @@
               <outputDirectory>${assembly-directory}/lib/jaspi</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-jaspi-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
+              <includeArtifactIds>javax.security.auth.message</includeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib/jaspi</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>unpack-config-deps</id>
             <phase>generate-resources</phase>
@@ -322,18 +457,34 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/jetty-assembly.xml</descriptor>
-          </descriptors>
           <tarLongFileMode>posix</tarLongFileMode>
           <appendAssemblyId>false</appendAssemblyId>
         </configuration>
         <executions>
           <execution>
+            <id>binary</id>
             <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/jetty-assembly.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>sources</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/jetty-source-assembly.xml</descriptor>
+              </descriptors>
+              <appendAssemblyId>true</appendAssemblyId>
+            </configuration>
           </execution>
         </executions>
       </plugin>

jetty-home/src/main/assembly/jetty-assembly.xml

@@ -1,5 +1,5 @@
 <assembly>
-  <id>assembly</id>
+  <id>binary-assembly</id>
   <formats>
     <format>tar.gz</format>
     <format>zip</format>

jetty-home/src/main/assembly/jetty-source-assembly.xml

@@ -0,0 +1,22 @@
+<assembly>
+  <id>sources</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${source-assembly-directory}</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>**</include>
+      </includes>
+      <!--
+      <excludes>
+        <exclude>**/META-INF/**</exclude>
+        <exclude>*-config.jar</exclude>
+      </excludes>
+      -->
+    </fileSet>
+  </fileSets>
+</assembly>