r2312 - in trunk: . maven-jaxx-plugin - Jaxx-commits

2 Feb 2012

Author: tchemit
Date: 2012-02-03 00:56:50 +0100 (Fri, 03 Feb 2012)
New Revision: 2312

Url: http://nuiton.org/repositories/revision/jaxx/2312

Log:
updates to mavenpom 3.1

Modified:
   trunk/maven-jaxx-plugin/pom.xml
   trunk/pom.xml

Modified: trunk/maven-jaxx-plugin/pom.xml
===================================================================

--- trunk/maven-jaxx-plugin/pom.xml	2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/maven-jaxx-plugin/pom.xml	2012-02-02 23:56:50 UTC (rev 2312)
@@ -80,7 +80,7 @@
 
     <dependency>
       <groupId>org.nuiton</groupId>
-      <artifactId>maven-helper-plugin</artifactId>
+      <artifactId>helper-maven-plugin</artifactId>
     </dependency>
 
     <dependency>
@@ -135,7 +135,7 @@
 
     <dependency>
       <groupId>org.nuiton</groupId>
-      <artifactId>maven-helper-plugin</artifactId>
+      <artifactId>helper-maven-plugin</artifactId>
       <classifier>tests</classifier>
     </dependency>
 

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2012-01-04 17:18:38 UTC (rev 2311)
+++ trunk/pom.xml	2012-02-02 23:56:50 UTC (rev 2312)
@@ -23,7 +23,9 @@
   <http://www.gnu.org/licenses/lgpl-3.0.html>.
   #L%
   -->
-<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>
 
@@ -34,7 +36,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom4redmineAndCentral</artifactId>
-    <version>3.0.7</version>
+    <version>3.1</version>
   </parent>
 
   <artifactId>jaxx</artifactId>
@@ -61,7 +63,7 @@
       </roles>
     </developer>
 
-     <developer>
+    <developer>
       <name>Sylvain Letellier</name>
       <id>sletellier</id>
       <email>letellier@codelutin.com</email>
@@ -71,7 +73,7 @@
         <role>Developer</role>
       </roles>
     </developer>
-    
+
     <developer>
       <name>Jean Couteau</name>
       <id>jcouteau</id>
@@ -96,7 +98,6 @@
 
     <!-- pour un muli module on doit fixer le projectId -->
     <projectId>jaxx</projectId>
-    <helperPluginVersion>1.3.1-SNAPSHOT</helperPluginVersion>
     <nuitonUtilsVersion>2.3</nuitonUtilsVersion>
     <nuitonI18nVersion>2.4.1</nuitonI18nVersion>
     <eugeneVersion>2.3.2</eugeneVersion>
@@ -105,6 +106,8 @@
     <javaHelpVersion>2.0.05</javaHelpVersion>
     <swingXVersion>1.6.2-2</swingXVersion>
 
+    <webstartPluginVersion>1.0-beta-3-SNAPSHOT</webstartPluginVersion>
+
     <!-- i18n configuration -->
     <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>
   </properties>
@@ -113,7 +116,8 @@
   <!-- Source control management. -->
   <scm>
     <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection>
-    <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection>
+    <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk
+    </developerConnection>
     <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url>
   </scm>
 
@@ -123,7 +127,7 @@
       <url>${our.site.repository}/${projectId}</url>
     </site>
   </distributionManagement>
-  
+
   <dependencyManagement>
     <dependencies>
 
@@ -177,7 +181,7 @@
 
       <dependency>
         <groupId>org.nuiton</groupId>
-        <artifactId>maven-helper-plugin</artifactId>
+        <artifactId>helper-maven-plugin</artifactId>
         <version>${helperPluginVersion}</version>
         <scope>compile</scope>
         <exclusions>
@@ -250,7 +254,7 @@
 
       <dependency>
         <groupId>org.nuiton</groupId>
-        <artifactId>maven-helper-plugin</artifactId>
+        <artifactId>helper-maven-plugin</artifactId>
         <version>${helperPluginVersion}</version>
         <scope>test</scope>
         <classifier>tests</classifier>
@@ -468,9 +472,31 @@
         </plugin>
 
         <plugin>
-          <groupId>org.codehaus.mojo.webstart</groupId>
+          <groupId>org.codehaus.mojo</groupId>
           <artifactId>webstart-maven-plugin</artifactId>
+          <version>${webstartPluginVersion}</version>
           <configuration>
+
+            <libPath>lib</libPath>
+            <makeArchive>false</makeArchive>
+            <verbose>false</verbose>
+            <canUnsign>false</canUnsign>
+            <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>
             <gzip>true</gzip>
             <unsign>true</unsign>
             <canUnsign>false</canUnsign>
@@ -495,7 +521,7 @@
             </jnlpExtensions>
           </configuration>
         </plugin>
-        
+
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
           <configuration>

    

r2312 - in trunk: . maven-jaxx-plugin

tchemit＠users.nuiton.org

tags

participants (1)