Author: rgreig
Date: Mon Jan 15 09:29:32 2007
New Revision: 496414
URL: http://svn.apache.org/viewvc?view=rev&rev=496414
Log:
(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.
Modified:
incubator/qpid/trunk/qpid/java/broker/pom.xml
incubator/qpid/trunk/qpid/java/client/pom.xml
incubator/qpid/trunk/qpid/java/perftests/distribution/src/main/assembly/performance.xml
incubator/qpid/trunk/qpid/java/perftests/pom.xml
incubator/qpid/trunk/qpid/java/pom.xml
Modified: incubator/qpid/trunk/qpid/java/broker/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/pom.xml?view=diff&rev=496414&r1=496413&r2=496414
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/pom.xml Mon Jan 15 09:29:32 2007
@@ -37,6 +37,7 @@
</properties>
<dependencies>
+
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-common</artifactId>
@@ -45,12 +46,6 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -63,7 +58,7 @@
<artifactId>commons-lang</artifactId>
</dependency>
-<!-- Test Dependencies -->
+ <!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -75,6 +70,7 @@
<artifactId>easymockclassextension</artifactId>
<scope>test</scope>
</dependency>
+
</dependencies>
<build>
Modified: incubator/qpid/trunk/qpid/java/client/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/pom.xml?view=diff&rev=496414&r1=496413&r2=496414
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/client/pom.xml Mon Jan 15 09:29:32 2007
@@ -55,12 +55,6 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <exclusions> <!-- Tries to download 1.2.7-->
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -73,7 +67,7 @@
<artifactId>mina-filter-ssl</artifactId>
</dependency>
-<!-- Test Dependencies -->
+ <!-- Test Dependencies -->
<dependency> <!-- for inVm Broker -->
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker</artifactId>
Modified:
incubator/qpid/trunk/qpid/java/perftests/distribution/src/main/assembly/performance.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/distribution/src/main/assembly/performance.xml?view=diff&rev=496414&r1=496413&r2=496414
==============================================================================
---
incubator/qpid/trunk/qpid/java/perftests/distribution/src/main/assembly/performance.xml
(original)
+++
incubator/qpid/trunk/qpid/java/perftests/distribution/src/main/assembly/performance.xml
Mon Jan 15 09:29:32 2007
@@ -93,4 +93,4 @@
</excludes>
</dependencySet>
</dependencySets>
-G</assembly>
+</assembly>
Modified: incubator/qpid/trunk/qpid/java/perftests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/pom.xml?view=diff&rev=496414&r1=496413&r2=496414
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/perftests/pom.xml Mon Jan 15 09:29:32 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/pom.xml?view=diff&rev=496414&r1=496413&r2=496414
==============================================================================
--- incubator/qpid/trunk/qpid/java/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/pom.xml Mon Jan 15 09:29:32 2007
@@ -46,6 +46,14 @@
<name>Apache SNAPSHOT Repository</name>
<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
</snapshotRepository>
+
+ <!-- Qpid has a Wiki site, maven generated site not used. This is just
so that it can be created locally for viewing the reports. -->
+ <site>
+ <id>Qpid_Site</id>
+ <name>Qpid Site</name>
+ <url>file:/temp</url>
+ </site>
+
</distributionManagement>
<inceptionYear>2006</inceptionYear>
@@ -199,13 +207,13 @@
time, during the 'package' phase to capture the
version of any resources added to jar files.
This svnversion command is always run in the top
directory to accurately reflect the svnversion range accross all modules
at the time of the build.
- The properties are placed into a file
'qpidversion.properties' in the target/classes directory of any child module
that runs
- this plugin.
+ The properties are placed into a file
'qpidversion.properties' in the target/classes directory of any child module
+ that runs this plugin.
The 'qpidversion.properties' file is loaded by
the org.apache.qpid.common.QpidProperties class.
Be carefull of the possibility that the 'common'
module may run this antrun plugin and recieve its own set of
- qpidversion.properties and then the client or
broker being built against an older version of the common library ending up with
- the wrong version information. This is unlikely
to happen because the client or broker should pick up its own properties
- from the classpath first. If this happens it
will be obvious because the productName property will be
+ qpidversion.properties and then the client or
broker being built against an older version of the common library ending
+ up with the wrong version information. This is
unlikely to happen because the client or broker should pick up its own
+ properties from the classpath first. If this
happens it will be obvious because the productName property will be
'Qpid Common Utilities'. If this is a problem
then push this ant task down into the client and broker poms and remove it
from here.
-->
@@ -331,7 +339,9 @@
</plugin>
</plugins>
</pluginManagement>
+
<defaultGoal>install</defaultGoal>
+
</build>
<dependencyManagement>
@@ -360,13 +370,6 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.1</version>
- <exclusions>
- <!-- this seems to have a junit compile dependency -->
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -426,12 +429,22 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<version>2.2</version>
<scope>test</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>
+ <version>0.3</version>
+ <scope>test</scope>
+ </dependency>
+ -->
<!-- Qpid Version Dependencies -->
<dependency>
