Author: tchemit Date: 2014-02-12 00:20:29 +0100 (Wed, 12 Feb 2014) New Revision: 2954 Url: http://chorem.org/projects/jtimer/repository/revisions/2954 Log: fixes #984: updates nuiton-config to 3.0-alpha-2 fixes #985: updates commons-collections to 4.0 fixes #957: Updates mavenpom to 4.7 Modified: trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/pom.xml 2014-02-11 23:20:29 UTC (rev 2954) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.2</version> + <version>4.7</version> </parent> <groupId>org.chorem</groupId> @@ -63,11 +63,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> + <connection>scm:svn:https://chorem.org/svn/jtimer/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/jtimer/trunk + scm:svn:https://chorem.org/svn/jtimer/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> + <url>https://chorem.org/repositories/browse/jtimer/trunk</url> </scm> <distributionManagement> @@ -106,9 +106,6 @@ <!-- jnlp configuration --> <jnlpFileName>jTimer.jnlp</jnlpFileName> - <!-- Remove this while using mavenpom >= 4.3 --> - <webstartPluginVersion>1.0-beta-4</webstartPluginVersion> - </properties> <build> @@ -182,15 +179,16 @@ <libPath>lib</libPath> <makeArchive>false</makeArchive> - <verbose>false</verbose> + <!--<verbose>true</verbose>--> <updateManifestEntries> <Application-Name>jTimer ${project.version}</Application-Name> - <Permissions>all-permissions</Permissions> + <Permissions>all-permissions</Permissions> <Codebase>*</Codebase> + <!--<Application-Library-Allowable-Codebase>*</Application-Library-Allowable-Codebase>--> + <!--<Caller-Allowable-Codebase>*</Caller-Allowable-Codebase>--> </updateManifestEntries> - <!-- TODO Use this this webstart 1.0-beta-5 --> - <!--<outputJarVersions>true</outputJarVersions>--> - <jnlp> + <outputJarVersions>false</outputJarVersions> + <jnlp> <mainClass>${maven.jar.main.class}</mainClass> <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed> @@ -253,7 +251,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-2</version> <scope>compile</scope> <exclusions> <exclusion> @@ -340,8 +338,8 @@ <!-- commons-xxx lib --> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -445,6 +443,7 @@ </property> </activation> <build> + <defaultGoal>package</defaultGoal> <plugins> <!-- key store secrets availables --> <plugin> @@ -477,7 +476,7 @@ <id>generate-jnlp</id> <phase>package</phase> <goals> - <goal>jnlp-inline</goal> + <goal>jnlp-single</goal> </goals> </execution> </executions> Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2014-02-11 23:20:29 UTC (rev 2954) @@ -32,8 +32,8 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.data.TimerCore; Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2014-02-11 23:20:29 UTC (rev 2954) @@ -36,8 +36,8 @@ import javax.swing.table.TableColumn; import javax.swing.tree.TreePath; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/site/site_en.xml 2014-02-11 23:20:29 UTC (rev 2954) @@ -68,11 +68,11 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <menu name="Users" inherit="top"> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/site/site_fr.xml 2014-02-11 23:20:29 UTC (rev 2954) @@ -68,11 +68,11 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <menu name="Utilisateurs" inherit="top">