Author: tchemit Date: 2011-09-22 17:23:12 +0200 (Thu, 22 Sep 2011) New Revision: 3299 Url: http://chorem.org/repositories/revision/lima/3299 Log: T?\195?\162che #437: Can not launch via jnlp T?\195?\162che #460: Updates to mavenpom4remine 3.0.4 Modified: trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-09-22 15:21:31 UTC (rev 3298) +++ trunk/lima-swing/pom.xml 2011-09-22 15:23:12 UTC (rev 3299) @@ -232,30 +232,10 @@ <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <configuration> - <libPath>lib</libPath> - <makeArchive>false</makeArchive> - <verbose>false</verbose> <gzip>true</gzip> + <unsign>true</unsign> <canUnsign>false</canUnsign> - <!--<unsign>true</unsign>--> <pack200>true</pack200> - - <jnlp> - <mainClass>${maven.jar.main.class}</mainClass> - <allPermissions>true</allPermissions> - <offlineAllowed>true</offlineAllowed> - </jnlp> - <sign> - <keystore>${keystorepath}</keystore> - <storepass>${keystorepass}</storepass> - <alias>${keyalias}</alias> - <keypass>${keypass}</keypass> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> <jnlpExtensions> <jnlpExtension> <name>jxlayer</name> @@ -279,7 +259,7 @@ <profiles> <profile> - <id>myreporting</id> + <id>jnlp-reporting</id> <activation> <property> <name>performRelease</name> @@ -291,7 +271,7 @@ <plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>${jnlpPluginVersion}</version> + <version>${webstartPluginVersion}</version> </plugin> </plugins> </reporting> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 15:21:31 UTC (rev 3298) +++ trunk/pom.xml 2011-09-22 15:23:12 UTC (rev 3299) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -10,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.3</version> + <version>3.0.4-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -121,10 +123,10 @@ </dependency> <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>javaee-api</artifactId> - <version>5.0-3</version> - <scope>runtime</scope> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + <version>5.0-3</version> + <scope>runtime</scope> </dependency> <dependency> @@ -152,7 +154,7 @@ <artifactId>openejb-loader</artifactId> <version>${openEjbVersion}</version> </dependency> - + <!-- autres libraires --> <dependency> <groupId>org.swinglabs</groupId> @@ -188,6 +190,20 @@ <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> <version>2.1.7</version> + <exclusions> + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcmail-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bctsp-jdk14</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -201,9 +217,9 @@ <version>2.5-6.0.1</version> <scope>runtime</scope> </dependency> - + <!-- pdfbox to create pdf document --> - + <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> @@ -289,7 +305,7 @@ </roles> </contributor> <contributor> - <name>Victor Salaun</name> + <name>vsalaun</name> <email>salaun@codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com</organizationUrl> @@ -321,15 +337,12 @@ <!-- 1.4 and 1.4.1 breaks jnlp with corrupt jar <axis.version>1.3</axis.version>--> - <jnlpPluginVersion>1.0-beta-2</jnlpPluginVersion> - <!-- license to use --> <license.licenseName>gpl_v3</license.licenseName> </properties> <build> - <defaultGoal>install</defaultGoal> <pluginManagement> <plugins> @@ -365,17 +378,11 @@ </plugin> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${jnlpPluginVersion}</version> + <groupId>org.bluestemsoftware.open.maven.plugin</groupId> + <artifactId>launch4j-plugin</artifactId> + <version>1.5.0.0</version> </plugin> - <plugin> - <groupId>org.bluestemsoftware.open.maven.plugin</groupId> - <artifactId>launch4j-plugin</artifactId> - <version>1.5.0.0</version> - </plugin> - </plugins> </pluginManagement> @@ -386,7 +393,8 @@ <!-- ************************************************************* --> <scm> <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/trunk + <developerConnection> + scm:svn:http://svn.chorem.org/svn/lima/trunk </developerConnection> <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> @@ -399,69 +407,36 @@ </distributionManagement> <repositories> - <!-- depot des releases nuiton --> - <!--repository> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository--> - <!-- depot des snapshots nuiton --> - <!--repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository--> - <!-- jboss --> - <!--repository> - <id>jboss.repo</id> - <url>http://repository.jboss.org/maven2</url> - </repository> + <!-- nuiton nexus repository --> <repository> - <id>apache.snapshot</id> - <url>http://repository.apache.org/snapshots</url> - </repository--> + <id>nexus.nuiton</id> + <name>NuitonNexusRepository</name> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> </repositories> <pluginRepositories> - <!-- depot des releases nuiton --> - <!--pluginRepository> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </pluginRepository--> - <!-- depot des snapshots nuiton --> - <!--pluginRepository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository--> + <!-- nuiton nexus repository --> + <pluginRepository> + <id>nexus.nuiton</id> + <name>NuitonNexusRepository</name> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> </pluginRepositories> </project>