Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jetty-8

This commit is contained in:
Jesse McConnell 2012-04-13 14:59:15 -05:00
parent 4f7c896b3d cbc820a272
commit fe6298e5be
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jetty-distribution/pom.xml
View File

@ -201,6 +201,20 @@
<outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
</configuration>
</execution>
<execution>
<id>unpack-config-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty</includeGroupIds>
<classifier>config</classifier>
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
<excludes>META-INF/**</excludes>
<outputDirectory>${assembly-directory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-monitor-deps</id>
<phase>generate-resources</phase>
@ -406,7 +420,7 @@
<executions>
<execution>
<id>copy-lib-spdy-deps</id>
<phase>generate-resources</phase>
<phase>process-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
@ -418,7 +432,7 @@
</execution>
<execution>
<id>copy-spdy</id>
<phase>generate-resources</phase>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
@ -439,7 +453,7 @@
</execution>
<execution>
<id>unpack-spdy</id>
<phase>generate-resources</phase>
<phase>process-resources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>