Merge branch 'master' into release-9

This commit is contained in:
Jesse McConnell 2013-01-19 19:04:50 -06:00
commit f49017cd8e
1 changed files with 1 additions and 1 deletions

View File

@ -289,7 +289,7 @@
<includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
<includeArtifactIds>javax.transaction</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/jta</outputDirectory>
<outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
</configuration>
</execution>
<execution>