diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-05-23 13:02:12 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-05-23 13:02:12 +0000 |
| commit | bce8c55ee819e45332f74dab19c40f13d97c2877 (patch) | |
| tree | 920c6f0ba5d4f331dafd2765eec0fd80dfc07020 | |
| parent | b595da7578a5e421b04cdf5590a2c9bd5af4c08d (diff) | |
| download | qpid-python-bce8c55ee819e45332f74dab19c40f13d97c2877.tar.gz | |
QPID-5048: assembly and dependency fixups
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1597084 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml | 4 | ||||
| -rw-r--r-- | qpid/java/perftests/visualisation-jfc/pom.xml | 13 |
2 files changed, 15 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 beb9d8cb5f..dd27125d1f 100644 --- a/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml +++ b/qpid/java/perftests/src/main/assembly/qpid-perftests-bin.xml @@ -15,10 +15,10 @@ </includes> </fileSet> <fileSet> - <directory>${project.build.outputDirectory}/META-INF/</directory> + <directory>${basedir}/src/main/assembly/</directory> <outputDirectory>/</outputDirectory> <includes> - <include>README</include> + <include>README.txt</include> <include>NOTICE</include> <include>LICENSE</include> </includes> diff --git a/qpid/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml index 93bb2a402c..a3ccc1421c 100644 --- a/qpid/java/perftests/visualisation-jfc/pom.xml +++ b/qpid/java/perftests/visualisation-jfc/pom.xml @@ -34,6 +34,12 @@ <groupId>org.apache.qpid</groupId> <artifactId>qpid-perftests</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-client</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -71,6 +77,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-common</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> |