Author: echatellier Date: 2011-09-04 13:55:58 +0200 (Sun, 04 Sep 2011) New Revision: 2774 Url: http://chorem.org/repositories/revision/jtimer/2774 Log: Update dependencies (all in central now). Modified: trunk/pom.xml trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-19 16:31:41 UTC (rev 2773) +++ trunk/pom.xml 2011-09-04 11:55:58 UTC (rev 2774) @@ -40,14 +40,6 @@ </roles> </developer> <developer> - <name>Stéphane Chorlet</name> - <id>schorlet</id> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> <name>Tony Chemit</name> <id>tchemit</id> <email>chemit@codelutin.com</email> @@ -60,6 +52,16 @@ </developer> </developers> + <contributors> + <contributor> + <name>Stéphane Chorlet</name> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + </contributors> + <scm> <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> <developerConnection> @@ -94,8 +96,6 @@ <build> <resources> - <!-- TODO ce qui doit être filtree devrait etre dans src/main/filters --> - <!-- TODO en plus ce veut pas dire grand chose d'avoir deux fois la meme resource ??? c quoi ce hack ? --> <resource> <directory>src/main/resources</directory> <filtering>true</filtering> @@ -165,7 +165,7 @@ <plugins> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.5</version> + <version>2.7</version> <configuration> <configLocation>${maven.src.dir}/main/config/checkstyle.xml </configLocation> @@ -177,6 +177,7 @@ <plugin> <artifactId>maven-changelog-plugin</artifactId> + <version>2.2</version> <configuration> <type>range</type> <range>365</range> @@ -186,7 +187,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.4</version> + <version>2.5.1</version> </plugin> <!-- TODO Use this when jnlp will be ok --> @@ -202,7 +203,7 @@ <dependency> <groupId>org.jdesktop.bsaf</groupId> <artifactId>bsaf</artifactId> - <version>1.9</version> + <version>1.9.2</version> <scope>compile</scope> </dependency> <dependency> @@ -214,7 +215,7 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>3.2.7</version> + <version>3.3.0</version> <scope>compile</scope> </dependency> @@ -226,7 +227,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.16</version> + <version>2.3.18</version> </dependency> <dependency> <groupId>org.apache.xmlrpc</groupId> @@ -239,6 +240,12 @@ <artifactId>xmlrpc-common</artifactId> <version>${xmrpcVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> </dependency> <!-- commons-xxx lib --> @@ -270,14 +277,15 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.14.2</version> + <version>6.2</version> <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> </dependencies> <profiles> @@ -383,22 +391,4 @@ </build> </profile> </profiles> - - <repositories> - <repository> - <id>javanet.repository</id> - <url>http://download.java.net/maven/2/</url> - </repository> - <repository> - <id>nuiton.release</id> - <url>http://maven.nuiton.org/release</url> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>nuiton.release</id> - <url>http://maven.nuiton.org/release</url> - </pluginRepository> - </pluginRepositories> </project> Modified: trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java 2011-08-19 16:31:41 UTC (rev 2773) +++ trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java 2011-09-04 11:55:58 UTC (rev 2774) @@ -31,11 +31,10 @@ import java.util.HashSet; import java.util.List; -import junit.framework.Assert; - import org.chorem.jtimer.AbstractJTimerTest; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; +import org.testng.Assert; import org.testng.annotations.Test; /**