Author: tchemit Date: 2013-11-10 09:47:29 +0100 (Sun, 10 Nov 2013) New Revision: 2950 Url: http://chorem.org/projects/jtimer/repository/revisions/2950 Log: fixes #957: Updates to mavenpom 4.2 fixes #956: Make webstart starts more friendly Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-27 06:08:08 UTC (rev 2949) +++ trunk/pom.xml 2013-11-10 08:47:29 UTC (rev 2950) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.1</version> + <version>4.2</version> </parent> <groupId>org.chorem</groupId> @@ -92,11 +92,11 @@ <locales>fr,en</locales> <xmrpcVersion>3.1.3</xmrpcVersion> - + <!-- files to deploy to redmine --> <redmine.releaseFiles> target/${project.artifactId}-${project.version}-bin.zip, - target/${project.artifactId}-${project.version}-src.zip, + target/${project.artifactId}-${project.version}-src.zip </redmine.releaseFiles> <!-- Post Release configuration --> @@ -105,6 +105,9 @@ <!-- jnlp configuration --> <jnlpFileName>jTimer.jnlp</jnlpFileName> + <!-- Remove this while using mavenpom >= 4.3 --> + <webstartPluginVersion>1.0-beta-4</webstartPluginVersion> + </properties> <build> @@ -145,7 +148,7 @@ </executions> </plugin> </plugins> - + <pluginManagement> <plugins> <plugin> @@ -157,11 +160,6 @@ <mainClass>${maven.jar.main.class}</mainClass> <classpathPrefix>lib/</classpathPrefix> </manifest> - <!--FIXME tchemit 2013-10-26 Find out how to make jnlp trusted --> - <manifestEntries> - <Trusted-Only>true</Trusted-Only> - <!--Trusted-Library>true</Trusted-Library--> - </manifestEntries> </archive> </configuration> </plugin> @@ -184,8 +182,14 @@ <libPath>lib</libPath> <makeArchive>false</makeArchive> <verbose>false</verbose> - <canUnsign>false</canUnsign> - <jnlp> + <updateManifestEntries> + <Application-Name>jTimer ${project.version}</Application-Name> + <Permissions>all-permissions</Permissions> + <Codebase>*</Codebase> + </updateManifestEntries> + <!-- TODO Use this this webstart 1.0-beta-5 --> + <!--<outputJarVersions>true</outputJarVersions>--> + <jnlp> <mainClass>${maven.jar.main.class}</mainClass> <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed> @@ -203,10 +207,11 @@ </keystoreConfig> </sign> <gzip>true</gzip> - <unsign>false</unsign> - <canUnsign>false</canUnsign> - <!--Can't use pack2000 since there is some already signed jar--> - <pack200>true</pack200> + <unsign>true</unsign> + <canUnsign>true</canUnsign> + <pack200> + <enabled>true</enabled> + </pack200> </configuration> </plugin> </plugins>