r294 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web - Nuiton-web-commits

25 Dec 2013

Author: tchemit
Date: 2013-12-25 17:58:50 +0100 (Wed, 25 Dec 2013)
New Revision: 294

Url: http://nuiton.org/projects/nuiton-web/repository/revisions/294

Log:
refs #2987: updates mavenpom to 4.5 + tidy poms and site.xml

Modified:
   trunk/nuiton-gwt/pom.xml
   trunk/nuiton-rss/pom.xml
   trunk/nuiton-security/pom.xml
   trunk/nuiton-struts2/pom.xml
   trunk/nuiton-tapestry/pom.xml
   trunk/nuiton-web/pom.xml
   trunk/pom.xml

Modified: trunk/nuiton-gwt/pom.xml
===================================================================

--- trunk/nuiton-gwt/pom.xml	2013-12-25 16:56:23 UTC (rev 293)
+++ trunk/nuiton-gwt/pom.xml	2013-12-25 16:58:50 UTC (rev 294)
@@ -1,6 +1,5 @@
 <?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">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -11,6 +10,9 @@
 
   <artifactId>nuiton-gwt</artifactId>
 
+  <name>Nuiton Web :: Nuiton GWT</name>
+  <description>Extra classes for GWT based applications</description>
+
   <dependencies>
 
     <!-- GWT -->
@@ -21,9 +23,6 @@
 
   </dependencies>
 
-  <name>Nuiton Web :: Nuiton GWT</name>
-  <description>Extra classes for GWT based applications</description>
-
   <build>
     <plugins>
       <plugin>

Modified: trunk/nuiton-rss/pom.xml
===================================================================
--- trunk/nuiton-rss/pom.xml	2013-12-25 16:56:23 UTC (rev 293)
+++ trunk/nuiton-rss/pom.xml	2013-12-25 16:58:50 UTC (rev 294)
@@ -23,7 +23,6 @@
   #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">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -33,7 +32,21 @@
   </parent>
 
   <artifactId>nuiton-rss</artifactId>
+  <packaging>war</packaging>
 
+  <name>Nuiton Web :: Nuiton RSS</name>
+  <description>Servlet pouvant etre appeler depuis du JS pour recuperer un
+    flux RSS
+  </description>
+  <inceptionYear>2008</inceptionYear>
+
+  <properties>
+
+    <!-- extra files to include in release -->
+    <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>
+
+  </properties>
+
   <dependencies>
 
     <dependency>
@@ -84,34 +97,7 @@
 
   </dependencies>
 
-  <name>Nuiton Web :: Nuiton RSS</name>
-  <description>Servlet pouvant etre appeler depuis du JS pour recuperer un
-    flux RSS
-  </description>
-  <inceptionYear>2008</inceptionYear>
-
-  <packaging>war</packaging>
-
-  <properties>
-
-    <!-- extra files to include in release -->
-    <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>
-
-  </properties>
-
   <build>
-
-    <plugins>
-
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <outputDirectory>${project.build.directory}/lib</outputDirectory>
-        </configuration>
-      </plugin>
-
-    </plugins>
-
     <pluginManagement>
       <plugins>
 
@@ -137,6 +123,16 @@
       </plugins>
 
     </pluginManagement>
+    <plugins>
+
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <outputDirectory>${project.build.directory}/lib</outputDirectory>
+        </configuration>
+      </plugin>
+
+    </plugins>
   </build>
 
   <profiles>
@@ -205,5 +201,4 @@
     </profile>
 
   </profiles>
-
 </project>

Modified: trunk/nuiton-security/pom.xml
===================================================================
--- trunk/nuiton-security/pom.xml	2013-12-25 16:56:23 UTC (rev 293)
+++ trunk/nuiton-security/pom.xml	2013-12-25 16:58:50 UTC (rev 294)
@@ -1,6 +1,5 @@
 <?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">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -10,7 +9,11 @@
   </parent>
 
   <artifactId>nuiton-security</artifactId>
+  <packaging>jar</packaging>
 
+  <name>Nuiton Web :: Nuiton Security</name>
+  <description>Security module based on ToPIA</description>
+
   <properties>
 
     <!-- Post Release configuration -->
@@ -72,11 +75,6 @@
     </dependency>
   </dependencies>
 
-  <name>Nuiton Web :: Nuiton Security</name>
-  <description>Security module based on ToPIA</description>
-
-  <packaging>jar</packaging>
-
   <build>
     <plugins>
       <plugin>
@@ -121,4 +119,5 @@
       </plugin>
     </plugins>
   </build>
+
 </project>

Modified: trunk/nuiton-struts2/pom.xml
===================================================================
--- trunk/nuiton-struts2/pom.xml	2013-12-25 16:56:23 UTC (rev 293)
+++ trunk/nuiton-struts2/pom.xml	2013-12-25 16:58:50 UTC (rev 294)
@@ -1,6 +1,5 @@
 <?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">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

Modified: trunk/nuiton-tapestry/pom.xml
===================================================================
--- trunk/nuiton-tapestry/pom.xml	2013-12-25 16:56:23 UTC (rev 293)
+++ trunk/nuiton-tapestry/pom.xml	2013-12-25 16:58:50 UTC (rev 294)
@@ -1,6 +1,5 @@
 <?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">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -11,6 +10,9 @@
 
   <artifactId>nuiton-tapestry</artifactId>
 
+  <name>Nuiton Web :: Nuiton Tapestry</name>
+  <description>Extra classes for Tapestry based applications</description>
+
   <dependencies>
 
     <dependency>
@@ -55,9 +57,6 @@
 
   </dependencies>
 
-  <name>Nuiton Web :: Nuiton Tapestry</name>
-  <description>Extra classes for Tapestry based applications</description>
-
   <build>
     <plugins>
       <plugin>

Modified: trunk/nuiton-web/pom.xml
===================================================================
--- trunk/nuiton-web/pom.xml	2013-12-25 16:56:23 UTC (rev 293)
+++ trunk/nuiton-web/pom.xml	2013-12-25 16:58:50 UTC (rev 294)
@@ -1,7 +1,6 @@
 <?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">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -12,6 +11,17 @@
 
   <artifactId>nuiton-web</artifactId>
 
+  <name>Nuiton Web :: Nuiton Web</name>
+  <description>Usefull classes for web developpement.</description>
+  <inceptionYear>2011</inceptionYear>
+
+  <properties>
+
+    <!-- extra files to include in release -->
+    <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>
+
+  </properties>
+
   <dependencies>
 
     <!-- Dependencies for WarLaunchers -->
@@ -57,17 +67,6 @@
 
   </dependencies>
 
-  <name>Nuiton Web :: Nuiton Web</name>
-  <description>Usefull classes for web developpement.</description>
-  <inceptionYear>2011</inceptionYear>
-
-  <properties>
-
-    <!-- extra files to include in release -->
-    <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>
-
-  </properties>
-
   <build>
 
   </build>
@@ -114,5 +113,4 @@
     </profile>
 
   </profiles>
-
 </project>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2013-12-25 16:56:23 UTC (rev 293)
+++ trunk/pom.xml	2013-12-25 16:58:50 UTC (rev 294)
@@ -1,6 +1,5 @@
 <?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">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -12,7 +11,56 @@
   <groupId>org.nuiton.web</groupId>
   <artifactId>nuiton-web-parent</artifactId>
   <version>1.15-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
+  <name>Nuiton Web</name>
+  <description>Common ressources for web applications</description>
+  <url>http://maven-site.nuiton.org/nuiton-web/</url>
+  <inceptionYear>2010</inceptionYear>
+
+  <developers>
+    <developer>
+      <id>fdesbois</id>
+      <name>Florian DESBOIS</name>
+      <email>fdesbois@codelutin.com</email>
+      <organization>Code Lutin</organization>
+      <timezone>+2</timezone>
+      <roles>
+        <role>Développeur</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>tchemit</id>
+      <name>Tony Chemit</name>
+      <email>chemit@codelutin.com</email>
+      <organization>CodeLutin</organization>
+      <timezone>+2</timezone>
+      <roles>
+        <role>Développeur</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>jcouteau</id>
+      <name>Jean Couteau</name>
+      <email>couteau@codelutin.com</email>
+      <organization>CodeLutin</organization>
+      <timezone>+2</timezone>
+      <roles>
+        <role>Développeur</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>bleny</id>
+      <name>Brendan Le Ny</name>
+      <email>bleny@codelutin.com</email>
+      <organization>CodeLutin</organization>
+      <timezone>+2</timezone>
+      <roles>
+        <role>Développeur</role>
+      </roles>
+    </developer>
+  </developers>
+
   <modules>
     <module>nuiton-web</module>
     <module>nuiton-struts2</module>
@@ -22,6 +70,58 @@
     <module>nuiton-security</module>
   </modules>
 
+  <scm>
+    <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection>
+    <developerConnection>
+      scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk
+    </developerConnection>
+    <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url>
+  </scm>
+  <distributionManagement>
+    <site>
+      <id>${platform}</id>
+      <url>${our.site.repository}/${projectId}</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+
+    <!-- redmine configuration -->
+    <projectId>nuiton-web</projectId>
+
+    <eugeneVersion>2.7.3</eugeneVersion>
+
+    <nuitonI18nVersion>2.5.2</nuitonI18nVersion>
+    <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion>
+    <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion>
+
+    <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion>
+    <topiaVersion>3.0-SNAPSHOT</topiaVersion>
+
+    <!-- Tapestry -->
+    <tapestryVersion>5.2.4</tapestryVersion> <!-- Do not upgrade to 5.3.x because on some incompatibilities -->
+    <slf4jVersion>1.7.5</slf4jVersion>
+
+    <!-- GWT -->
+    <gwtVersion>2.2.0</gwtVersion>
+    <gwtPluginVersion>2.2.0</gwtPluginVersion>
+
+    <!-- Strust 2 -->
+    <struts2Version>2.3.16</struts2Version>
+
+    <shiroVersion>1.2.2</shiroVersion>
+    <servletApiVersion>2.5</servletApiVersion>
+    <jettyVersion>${jettyPluginVersion}</jettyVersion>
+    <windstoneVersion>0.9.10-hudson-24</windstoneVersion>
+
+    <!--Multilanguage maven-site -->
+    <siteLocales>en,fr</siteLocales>
+
+    <!-- license to use  -->
+    <license.licenseName>lgpl_v3</license.licenseName>
+
+  </properties>
+
   <dependencyManagement>
 
     <dependencies>
@@ -197,96 +297,13 @@
 
   </dependencyManagement>
 
-  <name>Nuiton Web</name>
-  <description>Common ressources for web applications</description>
-  <inceptionYear>2010</inceptionYear>
-  <url>http://maven-site.nuiton.org/nuiton-web/</url>
-
-  <developers>
-    <developer>
-      <id>fdesbois</id>
-      <name>Florian DESBOIS</name>
-      <email>fdesbois@codelutin.com</email>
-      <organization>Code Lutin</organization>
-      <timezone>+2</timezone>
-      <roles>
-        <role>Développeur</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>tchemit</id>
-      <name>Tony Chemit</name>
-      <email>chemit@codelutin.com</email>
-      <organization>CodeLutin</organization>
-      <timezone>+2</timezone>
-      <roles>
-        <role>Développeur</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>jcouteau</id>
-      <name>Jean Couteau</name>
-      <email>couteau@codelutin.com</email>
-      <organization>CodeLutin</organization>
-      <timezone>+2</timezone>
-      <roles>
-        <role>Développeur</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>bleny</id>
-      <name>Brendan Le Ny</name>
-      <email>bleny@codelutin.com</email>
-      <organization>CodeLutin</organization>
-      <timezone>+2</timezone>
-      <roles>
-        <role>Développeur</role>
-      </roles>
-    </developer>
-  </developers>
-
-  <packaging>pom</packaging>
-
-  <properties>
-
-    <!-- redmine configuration -->
-    <projectId>nuiton-web</projectId>
-
-    <eugeneVersion>2.7.3</eugeneVersion>
-
-    <nuitonI18nVersion>2.5.2</nuitonI18nVersion>
-    <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion>
-    <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion>
-
-    <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion>
-    <topiaVersion>3.0-SNAPSHOT</topiaVersion>
-
-    <!-- Tapestry -->
-    <tapestryVersion>5.2.4</tapestryVersion> <!-- Do not upgrade to 5.3.x because on some incompatibilities -->
-    <slf4jVersion>1.7.5</slf4jVersion>
-
-    <!-- GWT -->
-    <gwtVersion>2.2.0</gwtVersion>
-    <gwtPluginVersion>2.2.0</gwtPluginVersion>
-
-    <!-- Strust 2 -->
-    <struts2Version>2.3.16</struts2Version>
-
-    <shiroVersion>1.2.2</shiroVersion>
-    <servletApiVersion>2.5</servletApiVersion>
-    <jettyVersion>${jettyPluginVersion}</jettyVersion>
-    <windstoneVersion>0.9.10-hudson-24</windstoneVersion>
-
-    <!--Multilanguage maven-site -->
-    <siteLocales>en,fr</siteLocales>
-
-    <!-- license to use  -->
-    <license.licenseName>lgpl_v3</license.licenseName>
-
-  </properties>
-
   <build>
-
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <pluginManagement>
       <plugins>
 
@@ -320,13 +337,6 @@
         </plugin>
       </plugins>
     </pluginManagement>
-
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
   </build>
 
   <reporting>
@@ -334,21 +344,6 @@
     <excludeDefaults>true</excludeDefaults>
   </reporting>
 
-  <scm>
-    <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection>
-    <developerConnection>
-      scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk
-    </developerConnection>
-    <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url>
-  </scm>
-
-  <distributionManagement>
-    <site>
-      <id>${platform}</id>
-      <url>${our.site.repository}/${projectId}</url>
-    </site>
-  </distributionManagement>
-
   <profiles>
     <profile>
       <id>reporting</id>

    

r294 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web

tchemit＠users.nuiton.org

tags

participants (1)