[Lutingenerator-commits] r499 - in eugene/trunk: . src/main/assembly src/site - Eugene-commits

11 May 2009

Author: tchemit
Date: 2009-05-11 07:14:19 +0000 (Mon, 11 May 2009)
New Revision: 499

Modified:
   eugene/trunk/pom.xml
   eugene/trunk/src/main/assembly/deps.xml
   eugene/trunk/src/main/assembly/full.xml
   eugene/trunk/src/site/site.xml
Log:
* bump versions (lutinproject, lutinutil, doxia-module-jrst, maven-license-switcher-plugin)
* use doxia-modules-jrst instead of maven-jrst-plugin
* improve download section on site

Modified: eugene/trunk/pom.xml
===================================================================

--- eugene/trunk/pom.xml	2009-05-04 15:59:00 UTC (rev 498)
+++ eugene/trunk/pom.xml	2009-05-11 07:14:19 UTC (rev 499)
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.codelutin</groupId>
         <artifactId>lutinproject</artifactId>
-        <version>3.5</version>
+        <version>3.5.4</version>
     </parent>
 
     <groupId>org.nuiton</groupId>
@@ -69,10 +69,10 @@
             <version>1.1.1</version>
             <scope>runtime</scope>
             <exclusions>
-            	<exclusion>
-            		<groupId>com.ibm.icu</groupId>
-            		<artifactId>icu4j</artifactId>
-            	</exclusion>
+                <exclusion>
+                    <groupId>com.ibm.icu</groupId>
+                    <artifactId>icu4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         
@@ -95,7 +95,7 @@
     <!-- ************************************************************* -->
     <!-- *** Project Information ************************************* -->
     <!-- ************************************************************* -->
-    <name>Eugene</name>
+    <name>EUGene</name>
 
     <description>Efficient Universal Generator.</description>
     <inceptionYear>2004</inceptionYear>
@@ -113,14 +113,14 @@
         <!-- name du projet du labs -->
         <labs.project>lutingenerator</labs.project>
         
-        <lutinutil.version>1.0.4</lutinutil.version>
+        <lutinutil.version>1.0.6</lutinutil.version>
     </properties>
 
     <build>
 
         <defaultGoal>install</defaultGoal>
 
-		<resources>
+        <resources>
             <resource>
                 <directory>${maven.src.dir}/main/xsl</directory>
                 <includes>
@@ -128,43 +128,36 @@
                 </includes>
             </resource>
         </resources>
-        
-        <plugins>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                   <locales>fr,en</locales>
-                </configuration>
-                <dependencies>
-                  <dependency>
-                    <groupId>org.codelutin</groupId>
-                    <artifactId>doxia-module-jrst</artifactId>
-                    <version>1.0.0</version>
-                 </dependency>
-               </dependencies>
-            </plugin>
-            
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/deps.xml</descriptor>
-                        <descriptor>src/main/assembly/full.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
 
+        <pluginManagement>
+            <plugins>
+
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.1</version>
+                    <configuration>
+                        <descriptors>
+                            <descriptor>src/main/assembly/deps.xml</descriptor>
+                            <descriptor>src/main/assembly/full.xml</descriptor>
+                        </descriptors>
+                        <attach>false</attach>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.codelutin</groupId>
+                            <artifactId>doxia-module-jrst</artifactId>
+                            <version>1.0.1</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>
+
     </build>
 
     <!-- ************************************************************* -->
@@ -270,10 +263,7 @@
                     <plugin>
                         <groupId>org.codelutin</groupId>
                         <artifactId>maven-license-switcher-plugin</artifactId>
-                        <version>0.6</version>
-                        <configuration>
-                            <licenseName>${license-switcher.licenseName}</licenseName>
-                        </configuration>
+                        <version>0.8</version>
                         <executions>
                             <execution>
                                 <id>attach-licenses</id>
@@ -284,6 +274,21 @@
                             </execution>
                         </executions>
                     </plugin>
+
+                    <!-- launch in a release the assembly automaticly -->
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-assembly</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    
                 </plugins>
             </build>
         </profile>

Modified: eugene/trunk/src/main/assembly/deps.xml
===================================================================
--- eugene/trunk/src/main/assembly/deps.xml	2009-05-04 15:59:00 UTC (rev 498)
+++ eugene/trunk/src/main/assembly/deps.xml	2009-05-11 07:14:19 UTC (rev 499)
@@ -14,21 +14,32 @@
             <scope>runtime</scope>
         </dependencySet>
     </dependencySets>
-    <files>
-        <file>
-            <!--source>target/${artifact.artifactId}-${artifact.version}.jar</source-->
-            <source>target/${project.build.finalName}.jar</source>
-        </file>
-        <!-- <file>
-            <source>target/classes/THIRD-PARTY.txt</source>
-        </file> -->
-    </files>
     <fileSets>
         <fileSet>
+            <directory>target</directory>
+            <outputDirectory>/</outputDirectory>
             <includes>
+                <include>*.jar</include>
+            </includes>
+            <excludes>
+                <exclude>*-sources.jar</exclude>
+                <exclude>*-javadoc.jar</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <outputDirectory>/</outputDirectory>
+            <includes>
                 <include>README*</include>
                 <include>LICENSE*</include>
+                <include>pom.xml</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <outputDirectory>/</outputDirectory>
+            <directory>target/classes</directory>
+            <includes>
+                <include>THIRD-PARTY.txt</include>
+            </includes>
+        </fileSet>
     </fileSets>
 </assembly>
\ No newline at end of file

Modified: eugene/trunk/src/main/assembly/full.xml
===================================================================
--- eugene/trunk/src/main/assembly/full.xml	2009-05-04 15:59:00 UTC (rev 498)
+++ eugene/trunk/src/main/assembly/full.xml	2009-05-11 07:14:19 UTC (rev 499)
@@ -13,26 +13,35 @@
             <scope>runtime</scope>
         </dependencySet>
     </dependencySets>
-    <files>
-        <file>
-            <!--source>target/${artifact.artifactId}-${artifact.version}.jar</source-->
-            <source>target/${project.build.finalName}.jar</source>
-        </file>
-        <!-- <file>
-            <source>target/classes/THIRD-PARTY.txt</source>
-        </file> -->
-    </files>
     <fileSets>
         <fileSet>
+            <directory>target</directory>
+            <outputDirectory>/</outputDirectory>
             <includes>
+                <include>*.jar</include>
+            </includes>
+            <excludes>
+                <exclude>*-sources.jar</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <outputDirectory>/</outputDirectory>
+            <includes>
                 <include>README*</include>
                 <include>LICENSE*</include>
                 <include>pom.xml</include>
             </includes>
         </fileSet>
         <fileSet>
+            <outputDirectory>/</outputDirectory>
+            <directory>target/classes</directory>
+            <includes>
+                <include>THIRD-PARTY.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
             <directory>src</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
+            <!--useDefaultExcludes>true</useDefaultExcludes-->
         </fileSet>
     </fileSets>
 </assembly>
\ No newline at end of file

Modified: eugene/trunk/src/site/site.xml
===================================================================
--- eugene/trunk/src/site/site.xml	2009-05-04 15:59:00 UTC (rev 498)
+++ eugene/trunk/src/site/site.xml	2009-05-11 07:14:19 UTC (rev 499)
@@ -1,55 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="${project.name}">
 
-  <publishDate format="dd/MM/yyyy"/>
+    <publishDate format="dd/MM/yyyy"/>
   
-  <skin>                                                                                                                                                                                                                 
-    <groupId>org.codelutin</groupId>                                                                                                                                                                            
-    <artifactId>maven-lutin-skin</artifactId>
-    <version>0.2.3</version>
-  </skin>                 
+    <skin>
+        <groupId>org.codelutin</groupId>
+        <artifactId>maven-lutin-skin</artifactId>
+        <version>0.2.3</version>
+    </skin>
 	
-  <bannerLeft>
-     <name>${project.name}</name>
-  </bannerLeft>
+    <bannerLeft>
+        <name>${project.name}</name>
+    </bannerLeft>
 	
-  <bannerRight>
-     <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
-     <href>${project.organization.url}</href>
-  </bannerRight>
+    <bannerRight>
+        <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+        <href>${project.organization.url}</href>
+    </bannerRight>
 
-  <poweredBy>
-     <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/>
-     <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/>
-     <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/>
-  </poweredBy>    
+    <poweredBy>
+        <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/>
+        <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/>
+        <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/>
+    </poweredBy>
 
-  <body>
-    <links>
-      <item name="Maven-eugene-plugin" href="http://lutingenerator.labs.libre-entreprise.org/maven-eugene-plugin/"/>
-      <item name="Labs" href="http://labs.libre-entreprise.org/"/>
-      <item name="Code Lutin" href="http://www.codelutin.com/"/>
-    </links>
+    <body>
+        <links>
+            <item name="Maven-eugene-plugin" href="http://lutingenerator.labs.libre-entreprise.org/maven-eugene-plugin/"/>
+            <item name="Labs" href="http://labs.libre-entreprise.org/"/>
+            <item name="Code Lutin" href="http://www.codelutin.com/"/>
+        </links>
 
-    <menu name="Utilisateur">
-      <item href="index.html" name="Accueil"/>
-    </menu>
+        <menu name="Utilisateur">
+            <item href="index.html" name="Accueil"/>
+        </menu>
 
-    <menu name="Téléchargement">
-        <item href="${labs.builder.url}/org/nuiton/${project.artifactId}/${project.version}"
-              name="Télécharger la dernière version"/>
-        <item href="${labs.builder.url}/org/nuiton/${project.artifactId}"
-              name="Voir toutes les versions"/>
-    </menu>
+        <menu name="Téléchargement">
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+                  name="Librairie (jar)"/>
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+                  name="Javadoc (jar)"/>
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+                  name="Sources (jar)"/>
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip"
+                  name="Bundle sans sources (zip)"/>
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip"
+                  name="Bundle complêt (zip)"/>
+        </menu>
       
-    <menu name="Developpeur">
-      <item name="ObjectModel" href="ObjectModel.html"/>
-      <item name="StateModel" href="StateModel.html"/>
-      <item name="UIModel" href="DevUIDoc.html"/>
-      <item name="Todo" href="Todo.html"/>
-    </menu>
+        <menu name="Developpeur">
+            <item name="ObjectModel" href="ObjectModel.html"/>
+            <item name="StateModel" href="StateModel.html"/>
+            <item name="UIModel" href="DevUIDoc.html"/>
+            <item name="Todo" href="Todo.html"/>
+        </menu>
 
-    <menu ref="reports"/>
+        <menu ref="reports"/>
 
-  </body>
+    </body>
 </project>

    

[Lutingenerator-commits] r499 - in eugene/trunk: . src/main/assembly src/site

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)