diff options
| author | Robert Gemmell <robbie@apache.org = robbie = Robert Gemmell robbie@apache.org@apache.org> | 2014-04-13 14:09:59 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org = robbie = Robert Gemmell robbie@apache.org@apache.org> | 2014-04-13 14:09:59 +0000 |
| commit | 3ae1d953fcc19ffe95f17e8e2aeb8717bf8ef68b (patch) | |
| tree | 655a3ab54e6ec7cc64c9ad2706e6c7eaf435febf /qpid/java/perftests/src | |
| parent | d80a937c0552ba2a764a6c395a3962df59c02d50 (diff) | |
| download | qpid-python-3ae1d953fcc19ffe95f17e8e2aeb8717bf8ef68b.tar.gz | |
QPID-5048,QPID-5657: initial bulk change toward bringing the maven build on the 0.28 branch up to parity with trunk
Merges the following revisions from trunk:
r1579935
r1581349
r1582781
r1582782
r1585102
r1585103
r1585105
r1585106
r1585112
r1585440
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.28@1586990 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/perftests/src')
| -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> |