[dna-commits] DNA SVN: r254 - in trunk: dna-common and 2 other directories.

Author: rhauch Date: 2008-06-10 17:08:58 -0400 (Tue, 10 Jun 2008) New Revision: 254 Modified: trunk/dna-common/pom.xml trunk/dna-integration-tests/pom.xml trunk/dna-maven-classloader/pom.xml trunk/pom.xml Log: DNA-121 Remove dependency on JMock and use Mockito instead Modified: trunk/dna-common/pom.xml =================================================================== --- trunk/dna-common/pom.xml 2008-06-10 20:19:15 UTC (rev 253) +++ trunk/dna-common/pom.xml 2008-06-10 21:08:58 UTC (rev 254) @@ -28,13 +28,10 @@ <artifactId>hamcrest-library</artifactId> </dependency> <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock</artifactId> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - </dependency> <!-- Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing) --> Modified: trunk/dna-integration-tests/pom.xml =================================================================== --- trunk/dna-integration-tests/pom.xml 2008-06-10 20:19:15 UTC (rev 253) +++ trunk/dna-integration-tests/pom.xml 2008-06-10 21:08:58 UTC (rev 254) @@ -47,13 +47,10 @@ <artifactId>junit</artifactId> </dependency> <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock</artifactId> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - </dependency> <!-- Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing) --> Modified: trunk/dna-maven-classloader/pom.xml =================================================================== --- trunk/dna-maven-classloader/pom.xml 2008-06-10 20:19:15 UTC (rev 253) +++ trunk/dna-maven-classloader/pom.xml 2008-06-10 21:08:58 UTC (rev 254) @@ -39,13 +39,10 @@ <artifactId>junit</artifactId> </dependency> <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock</artifactId> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - </dependency> <!-- Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing) --> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-06-10 20:19:15 UTC (rev 253) +++ trunk/pom.xml 2008-06-10 21:08:58 UTC (rev 254) @@ -58,6 +58,7 @@ <module>dna-common</module> <module>dna-spi</module> <module>dna-repository</module> + <module>dna-jcr</module> <module>dna-maven-classloader</module> <module>sequencers/dna-sequencer-images</module> <module>sequencers/dna-sequencer-mp3</module> @@ -315,18 +316,6 @@ <version>1.1</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock</artifactId> - <version>2.4.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - <version>2.4.0</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId>