diff options
| author | Keith Wall <kwall@apache.org> | 2014-03-26 14:07:22 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-03-26 14:07:22 +0000 |
| commit | e7b1fb49e4d5521c952f3ebed73384611c3ceb48 (patch) | |
| tree | affa8ba3709336fff81f2c8fff3160f1e846cff0 /qpid/java/perftests | |
| parent | 0f126a7715502f4d9d6edc9d32632892cec865a7 (diff) | |
| parent | 2f4b36a7eb2398b8032b924e21e2c4d5590ce087 (diff) | |
| download | qpid-python-e7b1fb49e4d5521c952f3ebed73384611c3ceb48.tar.gz | |
NO-JIRA: Merge changes from trunk.
Command was:
svn merge https://svn.apache.org/repos/asf/qpid/trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1581851 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/perftests')
| -rw-r--r-- | qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml b/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml index a4f25fd415..170c6f193a 100644 --- a/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml +++ b/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml @@ -15,13 +15,12 @@ </includes> </fileSet> <fileSet> - <directory>${project.build.directory}/generated-licenses/</directory> + <directory>${project.build.outputDirectory}/META-INF/</directory> <outputDirectory>/</outputDirectory> <includes> <include>README</include> <include>NOTICE</include> <include>LICENSE</include> - <include>THIRDPARTY</include> </includes> <fileMode>0644</fileMode> <directoryMode>0755</directoryMode> |