diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-08-30 12:19:31 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-08-30 12:19:31 +0000 |
| commit | 61a61c3716e42bf175004049976391407f28704d (patch) | |
| tree | 8ab343c1941a7565532189763dc79473a10beb3c /java/broker/pom.xml | |
| parent | e183227707d150b1f42e750df0e90cd7dac8744e (diff) | |
| download | qpid-python-61a61c3716e42bf175004049976391407f28704d.tar.gz | |
Remerge of M2. All tests pass locally
Testing done in Intelij and mvn command line via windows/cygwin.
Python tests removed from auto build pending Jython-siztion. Tested running broker in intelij and python run-tests from cygwin.
All tests pass. (CombinedTest still exhibts a race condition. but that has always been so.)
Additional Race condition identified (around MsgReject/AutoDeleteQueues) during testing patch to follow.
systests are inconsistent Some use TestableMemoryMessageStore some use MemoryMessgaeStore.
Lets not roll back this change if issues are discovered. Lets work together to go forward and address any issues. I have spent a lot of time ensuring the tests work for me so I hope that they work for you.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@571129 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/pom.xml')
| -rw-r--r-- | java/broker/pom.xml | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/java/broker/pom.xml b/java/broker/pom.xml index f45795e25b..ac11ee704f 100644 --- a/java/broker/pom.xml +++ b/java/broker/pom.xml @@ -78,13 +78,6 @@ <!-- Test Dependencies --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.4.0</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -101,6 +94,25 @@ <build> <plugins> + + + <!--plugin> + <artifactId>minijar-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>minijars</goal> + </goals> + <configuration> + <stripUnusedClasses>true</stripUnusedClasses> + </configuration> + </execution> + </executions> + </plugin--> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> @@ -171,7 +183,8 @@ </testResource> </testResources> - <pluginManagement> + <!-- DISABLED - TOBE fixed by ritchiem - should use Jython. --> + <!--pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -204,7 +217,8 @@ <property name="command" value="python run-tests -v -I java_failing_0-8.txt"/> - <!--value="bash -c 'python run-tests -v -I java_failing.txt'"/>--> + + <-value="bash -c 'python run-tests -v -I java_failing.txt'"/>-> <ant antfile="python-test.xml" inheritRefs="true"> <target name="run-tests" /> @@ -219,7 +233,7 @@ </executions> </plugin> </plugins> - </pluginManagement> + </pluginManagement--> </build> |