[Eugene-commits] r633 - in trunk: . maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin

29 Sep 2009

Author: tchemit
Date: 2009-09-29 13:46:23 +0200 (Tue, 29 Sep 2009)
New Revision: 633

Modified:
   trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java
   trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugeneAbstractMojo.java
   trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java
   trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java
   trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Zargo2Xmi.java
   trunk/pom.xml
Log:
use maven-helper-plugin 1.1.0, mavenpom 1.0.3

Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java
===================================================================

--- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java	2009-09-22 10:05:07 UTC (rev 632)
+++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/CopyVersionFiles.java	2009-09-29 11:46:23 UTC (rev 633)
@@ -16,7 +16,7 @@
  * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
 package org.nuiton.eugene.plugin;
 
-import org.nuiton.util.PluginIOContext;
+import org.nuiton.plugin.PluginIOContext;
 import java.io.File;
 import java.io.FileFilter;
 
@@ -28,7 +28,7 @@
 import org.dom4j.Node;
 import org.dom4j.io.SAXReader;
 import org.dom4j.Document;
-import org.nuiton.util.PluginHelper;
+import org.nuiton.plugin.PluginHelper;
 
 /**
  * Copy a file set to a versionned directory structure.

Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugeneAbstractMojo.java
===================================================================
--- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugeneAbstractMojo.java	2009-09-22 10:05:07 UTC (rev 632)
+++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugeneAbstractMojo.java	2009-09-29 11:46:23 UTC (rev 633)
@@ -1,6 +1,6 @@
 package org.nuiton.eugene.plugin;
 
-import org.nuiton.util.PluginIOContext;
+import org.nuiton.plugin.PluginIOContext;
 import java.io.File;
 import java.net.URL;
 import java.util.Arrays;

Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java
===================================================================
--- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java	2009-09-22 10:05:07 UTC (rev 632)
+++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java	2009-09-29 11:46:23 UTC (rev 633)
@@ -16,7 +16,6 @@
  * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
 package org.nuiton.eugene.plugin;
 
-import org.nuiton.util.PluginIOContext;
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -35,7 +34,8 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 import org.nuiton.eugene.Generator;
-import org.nuiton.util.PluginHelper;
+import org.nuiton.plugin.PluginIOContext;
+import org.nuiton.plugin.PluginHelper;
 
 /**
  * Effectue toutes les générations et copie les fichiers générés

Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java
===================================================================
--- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java	2009-09-22 10:05:07 UTC (rev 632)
+++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Xmi2Model.java	2009-09-29 11:46:23 UTC (rev 633)
@@ -16,7 +16,7 @@
  * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/
 package org.nuiton.eugene.plugin;
 
-import org.nuiton.util.PluginIOContext;
+import org.nuiton.plugin.PluginIOContext;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -40,9 +40,9 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
+import org.nuiton.plugin.PluginHelper;
 import org.nuiton.util.FasterCachedResourceResolver;
 import org.nuiton.util.FileUtil;
-import org.nuiton.util.PluginHelper;
 import org.nuiton.util.Resource;
 import org.nuiton.util.ResourceResolver;
 import org.nuiton.util.StringUtil;

Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Zargo2Xmi.java
===================================================================
--- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Zargo2Xmi.java	2009-09-22 10:05:07 UTC (rev 632)
+++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/Zargo2Xmi.java	2009-09-29 11:46:23 UTC (rev 633)
@@ -17,12 +17,12 @@
 package org.nuiton.eugene.plugin;
 
 import java.io.IOException;
-import org.nuiton.util.PluginIOContext;
 import java.io.File;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.nuiton.util.PluginHelper;
+import org.nuiton.plugin.PluginIOContext;
+import org.nuiton.plugin.PluginHelper;
 
 /**
  * Extract zipped XMI files from zargo archive.

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-09-22 10:05:07 UTC (rev 632)
+++ trunk/pom.xml	2009-09-29 11:46:23 UTC (rev 633)
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.nuiton</groupId>
         <artifactId>mavenpom</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>eugene</artifactId>
@@ -109,6 +109,72 @@
                 <groupId>org.nuiton</groupId>
                 <artifactId>maven-helper-plugin</artifactId>
                 <version>${helper.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.maven</groupId>
+                        <artifactId>maven-artifact</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>org.apache.maven</groupId>
+                        <artifactId>maven-artifact-manager</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>org.apache.maven.shared</groupId>
+                        <artifactId>maven-dependency-tree</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>org.apache.maven</groupId>
+                        <artifactId>maven-model</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>org.apache.maven</groupId>
+                        <artifactId>maven-profile</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>org.apache.maven</groupId>
+                        <artifactId>maven-settings</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-httpclient</groupId>
+                        <artifactId>commons-httpclient</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>plexus</groupId>
+                        <artifactId>plexus-mail-sender-simple</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>plexus</groupId>
+                        <artifactId>plexus-mail-sender-api</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>plexus</groupId>
+                        <artifactId>plexus-mail-sender-javamail</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>org.sonatype.plexus</groupId>
+                        <artifactId>plexus-cipher</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>org.sonatype.plexus</groupId>
+                        <artifactId>plexus-sec-dispatcher</artifactId>
+                    </exclusion>
+
+                </exclusions>
             </dependency>
 
             <!-- TODO TC-20090823 remove ant deps -->
@@ -149,7 +215,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.6</version>
+                <version>4.7</version>
                 <scope>test</scope>
             </dependency>
 
@@ -159,7 +225,7 @@
     <!-- ************************************************************* -->
     <!-- *** Project Information ************************************* -->
     <!-- ************************************************************* -->
-    <name>EUGene - pom</name>
+    <name>EUGene - project</name>
     <description>Efficient Universal Generator</description>
     <inceptionYear>2004</inceptionYear>
     <url>http://maven-site.nuiton.org/eugene</url>
@@ -174,6 +240,9 @@
         <!-- pour un muli module on doit fixer le projectId -->
         <projectId>eugene</projectId>
 
+        <!-- must be removed after mavenpom release, avoid hudson to break -->
+        <helper.version>1.1.0-SNAPSHOT</helper.version>
+
         <!-- TODO TC-20090823 remove ant deps -->
         <ant.version>1.7.1</ant.version>
        
@@ -192,7 +261,7 @@
                         <dependency>
                             <groupId>org.nuiton.jrst</groupId>
                             <artifactId>doxia-module-jrst</artifactId>
-                            <version>1.0.0</version>
+                            <version>${jrst.version}</version>
                         </dependency>
                     </dependencies>
                 </plugin>

    

[Eugene-commits] r633 - in trunk: . maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin

tchemit＠users.nuiton.org