Author: bayard Date: Tue Sep 15 05:21:51 2009 New Revision: 814994 URL: http://svn.apache.org/viewvc?rev=814994&view=rev Log: Merging from -r468106:814127 - namely adding easymock dependency, upgrading to target JDK 1.5 and upgrading JUnit to 4.3.1
Modified: commons/proper/collections/trunk/pom.xml Modified: commons/proper/collections/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/pom.xml?rev=814994&r1=814993&r2=814994&view=diff ============================================================================== --- commons/proper/collections/trunk/pom.xml (original) +++ commons/proper/collections/trunk/pom.xml Tue Sep 15 05:21:51 2009 @@ -339,7 +339,13 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> + <version>4.3.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.0</version> <scope>test</scope> </dependency> </dependencies> @@ -347,8 +353,9 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.compile.source>1.3</maven.compile.source> - <maven.compile.target>1.3</maven.compile.target> + <maven.compile.source>1.5</maven.compile.source> + + <maven.compile.target>1.5</maven.compile.target> <commons.componentid>collections</commons.componentid> <commons.release.version>3.3</commons.release.version> <commons.osgi.symbolicName>org.apache.commons.collections</commons.osgi.symbolicName>