summaryrefslogtreecommitdiff
path: root/qpid/java/perftests
diff options
context:
space:
mode:
authorRobert Greig <rgreig@apache.org>2007-01-15 17:29:32 +0000
committerRobert Greig <rgreig@apache.org>2007-01-15 17:29:32 +0000
commit0ed49f10566e27dc2544e3296db13a1d3d6730f7 (patch)
treeaece068c25fe233227e1390d4fb2af666623c0f1 /qpid/java/perftests
parent1a2327b98e6d5b2a65a12b70a9abc3f5ceb0f113 (diff)
downloadqpid-python-0ed49f10566e27dc2544e3296db13a1d3d6730f7.tar.gz
(Patch submitted by Rupert Smith) QPID-297
There were junit exclusions in the POM files that were causing junit to not be found when compiling tests. This may be a maven bug, but a better solution is to exclude stuff in assembly descriptors instead. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@496414 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/perftests')
-rw-r--r--qpid/java/perftests/distribution/src/main/assembly/performance.xml2
-rw-r--r--qpid/java/perftests/pom.xml24
2 files changed, 24 insertions, 2 deletions
diff --git a/qpid/java/perftests/distribution/src/main/assembly/performance.xml b/qpid/java/perftests/distribution/src/main/assembly/performance.xml
index c36b7e3640..0bf7efa21e 100644
--- a/qpid/java/perftests/distribution/src/main/assembly/performance.xml
+++ b/qpid/java/perftests/distribution/src/main/assembly/performance.xml
@@ -93,4 +93,4 @@
</excludes>
</dependencySet>
</dependencySets>
-G</assembly>
+</assembly>
diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml
index 98d2696b80..bfa24d99a3 100644
--- a/qpid/java/perftests/pom.xml
+++ b/qpid/java/perftests/pom.xml
@@ -38,10 +38,32 @@
</properties>
<dependencies>
+
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <!-- Here JUnit is a deliberate 'compile' scope dependency, it will be packaged with the perf testing tools. -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Will be added to maven repo soon. JUnit test runner that can add repeats/concurrenct/timing etc to tests.
+ <dependency>
+ <groupId>uk.co.thebadgerset</groupId>
+ <artifactId>junit-toolkit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ -->
+
</dependencies>
<build>
@@ -54,7 +76,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <!--<skip>true</skip>-->
</configuration>
</plugin>