aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2012-11-29 06:01:06 (EST)
committerThomas Becker2012-11-29 06:01:06 (EST)
commit1b5de5ae6454e58157ca2ee78517a86c0b966135 (patch)
tree2e85a90a607841be1025be06e37c95277c197107
parent800ef53fef0199680edc00bdfff7661ed3e2aadb (diff)
downloadorg.eclipse.jetty.project-1b5de5ae6454e58157ca2ee78517a86c0b966135.zip
org.eclipse.jetty.project-1b5de5ae6454e58157ca2ee78517a86c0b966135.tar.gz
org.eclipse.jetty.project-1b5de5ae6454e58157ca2ee78517a86c0b966135.tar.bz2
Readd unpack spdy jars in jetty-distribution
-rw-r--r--jetty-distribution/pom.xml97
1 files changed, 56 insertions, 41 deletions
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 54bf1de..926e605 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -161,7 +161,8 @@
<outputDirectory>${assembly-directory}/lib/websocket</outputDirectory>
</configuration>
</execution>
- <execution>
+
+ <execution>
<id>copy-orbit-servlet-api-deps</id>
<phase>generate-resources</phase>
<goals>
@@ -179,46 +180,60 @@
</artifactItem>
</artifactItems>
</configuration>
- </execution>
- <execution>
- <id>copy-lib-spdy-deps</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>org.eclipse.jetty.spdy</includeGroupIds>
- <includeTypes>jar</includeTypes>
- <outputDirectory>${assembly-directory}/lib/spdy</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>copy-orbit-lib-annotations-deps</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
- <includeArtifactIds>javax.annotation,org.objectweb.asm</includeArtifactIds>
- <includeTypes>jar</includeTypes>
- <outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>copy-orbit-lib-jta-deps</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
- <includeArtifactIds>javax.transaction</includeArtifactIds>
- <includeTypes>jar</includeTypes>
- <outputDirectory>${assembly-directory}/lib/jta</outputDirectory>
- </configuration>
- </execution>
- <execution>
+ </execution>
+ <execution>
+ <id>unpack-spdy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>org.eclipse.jetty.spdy</includeGroupIds>
+ <classifier>config</classifier>
+ <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+ <excludes>META-INF/**</excludes>
+ <outputDirectory>${assembly-directory}</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-lib-spdy-deps</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>org.eclipse.jetty.spdy</includeGroupIds>
+ <includeTypes>jar</includeTypes>
+ <outputDirectory>${assembly-directory}/lib/spdy</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-orbit-lib-annotations-deps</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
+ <includeArtifactIds>javax.annotation,org.objectweb.asm</includeArtifactIds>
+ <includeTypes>jar</includeTypes>
+ <outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-orbit-lib-jta-deps</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
+ <includeArtifactIds>javax.transaction</includeArtifactIds>
+ <includeTypes>jar</includeTypes>
+ <outputDirectory>${assembly-directory}/lib/jta</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
<id>copy-orbit-lib-jndi-deps</id>
<phase>generate-resources</phase>
<goals>