r2130 - trunk - Topia-commits

26 Oct 2010

Author: tchemit
Date: 2010-10-26 14:07:00 +0200 (Tue, 26 Oct 2010)
New Revision: 2130

Url: http://nuiton.org/repositories/revision/topia/2130

Log:
use mavenpom 2.4-SNAPSHOT
use camelCase style for version properties
use default libraries version from mavenpom

Modified:
   trunk/pom.xml

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

--- trunk/pom.xml	2010-10-17 01:38:46 UTC (rev 2129)
+++ trunk/pom.xml	2010-10-26 12:07:00 UTC (rev 2130)
@@ -33,7 +33,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom4redmineAndCentral</artifactId>
-    <version>2.3.2</version>
+    <version>2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>topia</artifactId>
@@ -60,21 +60,20 @@
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.16</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>org.nuiton.eugene</groupId>
         <artifactId>eugene</artifactId>
-        <version>${eugene.version}</version>
+        <version>${eugeneVersion}</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-utils</artifactId>
-        <version>${lutinutil.version}</version>
+        <version>${nuitonUtilsVersion}</version>
         <scope>compile</scope>
       </dependency>
 
@@ -82,28 +81,24 @@
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
-        <version>3.2.1</version>
-        <scope>compile</scope>
       </dependency>
 
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
-        <version>2.4</version>
-        <scope>compile</scope>
       </dependency>
 
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
-        <version>${hibernate.version}</version>
+        <version>${hibernateVersion}</version>
         <scope>compile</scope>
       </dependency>
 
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-ehcache</artifactId>
-        <version>${hibernate.version}</version>
+        <version>${hibernateVersion}</version>
         <scope>runtime</scope>
       </dependency>
 
@@ -133,7 +128,6 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.8.1</version>
         <scope>test</scope>
       </dependency>
 
@@ -144,14 +138,14 @@
       <!--dependency>
           <groupId>org.apache.xmlrpc</groupId>
           <artifactId>xmlrpc-server</artifactId>
-          <version>${xmlrpc.version}</version>
+          <version>${xmlrpcVersion}</version>
           <scope>compile</scope>
 
       </dependency>
       <dependency>
           <groupId>org.apache.xmlrpc</groupId>
           <artifactId>xmlrpc-client</artifactId>
-          <version>${xmlrpc.version}</version>
+          <version>${xmlrpcVersion}</version>
           <scope>compile</scope>
       </dependency-->
 
@@ -327,12 +321,12 @@
     <projectId>topia</projectId>
 
     <!-- libs version -->
-    <eugene.version>2.2</eugene.version>
-    <lutinutil.version>1.4.2</lutinutil.version>
-    <processor.version>1.0.3</processor.version>
-    <i18n.version>1.2.2</i18n.version>
-    <xmlrpc.version>3.1.2</xmlrpc.version>
-    <hibernate.version>3.3.2.GA</hibernate.version>
+    <eugeneVersion>2.2</eugeneVersion>
+    <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion>
+    <processorPluginVersion>1.0.3</processorPluginVersion>
+    <nuitonI18nVersion>1.2.2</nuitonI18nVersion>
+    <xmlrpcVersion>3.1.2</xmlrpcVersion>
+    <hibernateVersion>3.3.2.GA</hibernateVersion>
     
   </properties>
 
@@ -344,7 +338,7 @@
         <plugin>
           <groupId>org.nuiton.processor</groupId>
           <artifactId>maven-processor-plugin</artifactId>
-          <version>${processor.version}</version>
+          <version>${processorPluginVersion}</version>
           <executions>
             <execution>
               <phase>generate-sources</phase>
@@ -365,7 +359,7 @@
         <plugin>
           <groupId>org.nuiton.eugene</groupId>
           <artifactId>maven-eugene-plugin</artifactId>
-          <version>${eugene.version}</version>
+          <version>${eugeneVersion}</version>
           <configuration>
             <inputs>zargo</inputs>
             <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver>
@@ -375,7 +369,7 @@
         <plugin>
           <groupId>org.nuiton.i18n</groupId>
           <artifactId>maven-i18n-plugin</artifactId>
-          <version>${i18n.version}</version>
+          <version>${nuitonI18nVersion}</version>
         </plugin>
 
         <plugin>
@@ -384,7 +378,7 @@
             <dependency>
               <groupId>org.nuiton.jrst</groupId>
               <artifactId>doxia-module-jrst</artifactId>
-              <version>${jrst.version}</version>
+              <version>${jrstPluginVersion}</version>
             </dependency>
           </dependencies>
         </plugin>

    

r2130 - trunk

tchemit＠users.nuiton.org

tags

participants (1)