Author: echatellier Date: 2009-11-03 09:49:15 +0100 (Tue, 03 Nov 2009) New Revision: 2684 Modified: trunk/changelog.txt trunk/pom.xml Log: Swingx version bump. Move swing worker exclusion to swingx. Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-11-02 17:06:20 UTC (rev 2683) +++ trunk/changelog.txt 2009-11-03 08:49:15 UTC (rev 2684) @@ -3,10 +3,13 @@ jTimer (1.3.1) stable; urgency=low + * Readd jnlp launch * Fix systray popup menu not closed on focus lost * Force task selection on right clic * Fix duration edition (task and alerts) + * Add icon into assembly archive * Fix NPE related to non available systray + * Swingx version bump : 1.6 (java 6, full nimbus support) * JNA version bump : 3.2.3 -- chatellier -- jeu. oct. 15 11:08:23 CEST 2009 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 17:06:20 UTC (rev 2683) +++ trunk/pom.xml 2009-11-03 08:49:15 UTC (rev 2684) @@ -296,20 +296,20 @@ <artifactId>appframework</artifactId> <version>1.0.3</version> <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx</artifactId> + <version>1.6</version> + <scope>compile</scope> <exclusions> <exclusion> - <groupId>org.jdesktop</groupId> + <groupId>org.swinglabs</groupId> <artifactId>swing-worker</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swingx</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> <version>3.2.3</version>