Author: echatellier Date: 2010-04-16 17:48:50 +0200 (Fri, 16 Apr 2010) New Revision: 2733 Log: Fix broken pom. Generate exe file during maven build. Removed: trunk/src/main/assembly/jtimer.exe Modified: trunk/changelog.txt trunk/pom.xml trunk/src/main/assembly/bin.xml trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-04-16 15:48:05 UTC (rev 2732) +++ trunk/changelog.txt 2010-04-16 15:48:50 UTC (rev 2733) @@ -3,13 +3,15 @@ jTimer (1.3.2) stable; urgency=low - * Add Mac OS 10.4+ idle time detection support - * Allow adding notes on synchronized projects + * #105 : Add F2 shortcut to edit task + * #183 : Add Mac OS 10.4+ idle time detection support + * #184 : Allow adding notes on synchronized projects * #80 : Add parent node to select/unselect all projects on report UI * Freemarker updated to 2.3.16 - * JNA updated to 3.2.4 + * JNA updated to 3.2.5 + * Apache/XML-RPC updated to 3.1.3 - -- chatellier -- ven. déc. 18 09:54:03 CET 2009 + -- chatellier -- ven. avril 16 14:55:06 CEST 2010 jTimer (1.3.1) stable; urgency=low Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-16 15:48:05 UTC (rev 2732) +++ trunk/pom.xml 2010-04-16 15:48:50 UTC (rev 2733) @@ -71,7 +71,7 @@ <platform>chorem.org</platform> <!--Main class in JAR --> - <maven.jar.main.class>org.chorem.lima.Main</maven.jar.main.class> + <maven.jar.main.class>org.chorem.jtimer.JTimer</maven.jar.main.class> <!-- license to use --> <license.licenseName>gpl_v3</license.licenseName> @@ -112,18 +112,18 @@ <pluginManagement> <plugins> - <!--plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> <manifest> <addClasspath>true</addClasspath> - <mainClass>${exec.mainClass}</mainClass> + <mainClass>${maven.jar.main.class}</mainClass> <classpathPrefix>lib/</classpathPrefix> </manifest> </archive> </configuration> - </plugin--> + </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -148,22 +148,28 @@ </plugin> </plugins> </pluginManagement> - + <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> + <groupId>org.bluestemsoftware.open.maven.plugin</groupId> + <artifactId>launch4j-plugin</artifactId> + <version>1.5.0.0</version> <executions> <execution> - <phase>validate</phase> + <id>launch4j</id> + <phase>package</phase> <goals> - <goal>create</goal> + <goal>launch4j</goal> </goals> <configuration> - <format>{0,date,yyyy-MM-dd}</format> - <items> - <item>timestamp</item> - </items> + <dontWrapJar>true</dontWrapJar> + <headerType>gui</headerType> + <outfile>target/jtimer.exe</outfile> + <jar>jtimer.jar</jar> + <errTitle>${project.name}</errTitle> + <jre> + <minVersion>1.6.0</minVersion> + </jre> </configuration> </execution> </executions> @@ -183,6 +189,14 @@ </plugin> <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <configuration> + <type>range</type> + <range>365</range> + </configuration> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> <version>2.3</version> @@ -201,7 +215,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.10</version> + <version>5.11</version> <scope>test</scope> <classifier>jdk15</classifier> </dependency> @@ -230,7 +244,7 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>3.2.4</version> + <version>3.2.5</version> <scope>compile</scope> </dependency> <dependency> @@ -242,7 +256,7 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> + <version>2.5</version> <scope>compile</scope> </dependency> <dependency> @@ -289,7 +303,7 @@ <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-client</artifactId> - <version>3.1.2</version> + <version>3.1.3</version> <scope>compile</scope> </dependency> <dependency> Modified: trunk/src/main/assembly/bin.xml =================================================================== --- trunk/src/main/assembly/bin.xml 2010-04-16 15:48:05 UTC (rev 2732) +++ trunk/src/main/assembly/bin.xml 2010-04-16 15:48:50 UTC (rev 2733) @@ -25,7 +25,7 @@ <destName>jtimer.png</destName> </file> <file> - <source>src/main/assembly/jtimer.exe</source> + <source>target/jtimer.exe</source> </file> <file> <source>src/main/assembly/jtimer</source> Deleted: trunk/src/main/assembly/jtimer.exe =================================================================== (Binary files differ) Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2010-04-16 15:48:05 UTC (rev 2732) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2010-04-16 15:48:50 UTC (rev 2733) @@ -4,7 +4,7 @@ #�About i18n aboutTitle = About ${Application.title} aboutHtmlTitle = About ${Application.title} -aboutHtml = <html><b>${Application.title} - ${Application.version} (${buildNumber})</b><br /><br />Copyright 2007 - 2010, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> +aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2010, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> aboutLicenseTitle = License aboutLicense = You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ${Application.title}. All rights reserved. No guarantees are provided for use of this program. Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2010-04-16 15:48:05 UTC (rev 2732) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2010-04-16 15:48:50 UTC (rev 2733) @@ -1,7 +1,7 @@ #�About i18n aboutTitle = \u00C0 propos de ${Application.title} aboutHtmlTitle = \u00C0 propos de ${Application.title} -aboutHtml = <html><b>${Application.title} - ${Application.version} (${buildNumber})</b><br /><br />Copyright 2007 - 2010, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> +aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2010, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> aboutLicenseTitle = Licence aboutLicense = Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec ${Application.title}. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme.