Merge pull request #3848 from eclipse/jetty-10.0.x-3839-JavaxWebSocke…

…tApiJar Issue #3839 - copy dependency for jetty-javax-websocket-api
jetty · Jul 10, 2019 · 86d5ed0 · 86d5ed0
2 parents 352d1e7 + 9a2253d
commit 86d5ed0
Showing 1 changed file with 29 additions and 4 deletions.
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
@@ -177,8 +177,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>javax.websocket,org.eclipse.jetty.websocket</includeGroupIds>
-              <excludeArtifactIds>javax.websocket-client-api</excludeArtifactIds>
+              <includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/websocket</outputDirectory>
             </configuration>
@@ -190,8 +189,34 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>javax.websocket,org.eclipse.jetty.websocket</includeGroupIds>
-              <excludeArtifactIds>javax.websocket-client-api</excludeArtifactIds>
+              <includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib/websocket</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-lib-javax-websocket-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.toolchain</includeGroupIds>
+              <includeArtifactIds>jetty-javax-websocket-api</includeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <outputDirectory>${assembly-directory}/lib/websocket</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-lib-javax-websocket-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.toolchain</includeGroupIds>
+              <includeArtifactIds>jetty-javax-websocket-api</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib/websocket</outputDirectory>