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

Issue #3839 - copy dependency for jetty-javax-websocket-api
This commit is contained in:
Lachlan 2019-07-10 15:48:29 +10:00 committed by GitHub
commit 86d5ed0569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 4 deletions

View File

@ -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>