r190 - trunk - Bow-commits

14 Feb 2011

Author: tchemit
Date: 2011-02-14 14:56:42 +0100 (Mon, 14 Feb 2011)
New Revision: 190

Url: http://chorem.org/repositories/revision/bow/190

Log:
clean pom once again\!\!\!

Modified:
   trunk/pom.xml

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

--- trunk/pom.xml	2011-02-14 11:49:15 UTC (rev 189)
+++ trunk/pom.xml	2011-02-14 13:56:42 UTC (rev 190)
@@ -1,5 +1,7 @@
 <?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">
+<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>
 
@@ -17,13 +19,105 @@
   <artifactId>bow</artifactId>
   <version>0.4-SNAPSHOT</version>
 
+  <name>bow</name>
+  <description>bookmarks on web</description>
+  <inceptionYear>2010</inceptionYear>
+  <packaging>war</packaging>
+
+  <scm>
+    <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection>
+    <developerConnection>
+      scm:svn:http://svn.chorem.org/svn/bow/trunk
+    </developerConnection>
+    <url>http://www.chorem.org/repositories/browse/bow/trunk</url>
+  </scm>
+
+  <properties>
+    <platform>chorem.org</platform>
+    <projectId>bow</projectId>
+
+    <eugenePluginVersion>2.3.2</eugenePluginVersion>
+    <nuitonUtilsVersion>2.0</nuitonUtilsVersion>
+    <nuitonI18nVersion>2.3</nuitonI18nVersion>
+    <wikittyVersion>3.0.4-SNAPSHOT</wikittyVersion>
+    <slf4jVersion>1.6.1</slf4jVersion>
+    <struts2Version>2.1.8.1</struts2Version>
+
+    <i18n.bundles>fr_FR,en_GB</i18n.bundles>
+    <i18n.silent>true</i18n.silent>
+    <i18n.bundleOutputName>bow-i18n</i18n.bundleOutputName>
+    <i18n.bundleOutputDir>${basedir}/target/generated-sources/resources
+    </i18n.bundleOutputDir>
+    <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent>
+
+    <!-- license to use  -->
+    <license.licenseName>agpl_v3</license.licenseName>
+  </properties>
+
   <dependencies>
+
+    <!-- compile dependencies -->
+
     <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>nuiton-utils</artifactId>
+      <version>${nuitonUtilsVersion}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.nuiton.i18n</groupId>
+      <artifactId>nuiton-i18n</artifactId>
+      <version>${nuitonI18nVersion}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.nuiton.wikitty</groupId>
+      <artifactId>wikitty-api</artifactId>
+      <version>${wikittyVersion}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-core</artifactId>
+      <version>${struts2Version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.opensymphony</groupId>
+      <artifactId>xwork-core</artifactId>
+      <version>2.1.6</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+
+    <!--dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.2.1</version>
+    </dependency-->
+
+    <dependency>
+      <groupId>org.htmlparser</groupId>
+      <artifactId>htmlparser</artifactId>
+      <version>1.6</version>
+    </dependency>
+
+    <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
       <version>1.4.3</version>
     </dependency>
 
+    <!-- provided dependencies -->
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -38,6 +132,8 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- runtime dependencies -->
+
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -46,20 +142,16 @@
 
     <dependency>
       <groupId>org.nuiton.wikitty</groupId>
-      <artifactId>wikitty-api</artifactId>
-      <version>${wikittyVersion}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.nuiton.wikitty</groupId>
       <artifactId>wikitty-jdbc-impl</artifactId>
       <version>${wikittyVersion}</version>
+      <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.nuiton.wikitty</groupId>
       <artifactId>wikitty-solr-impl</artifactId>
       <version>${wikittyVersion}</version>
+      <scope>runtime</scope>
     </dependency>
 
     <dependency>
@@ -84,111 +176,28 @@
     </dependency>
 
     <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-utils</artifactId>
-      <version>${nuitonUtilsVersion}</version>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-spring-plugin</artifactId>
+      <version>${struts2Version}</version>
+      <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.nuiton.i18n</groupId>
-      <artifactId>nuiton-i18n</artifactId>
-      <version>${nuitonI18nVersion}</version>
-    </dependency>
 
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.2.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.htmlparser</groupId>
-      <artifactId>htmlparser</artifactId>
-      <version>1.6</version>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.struts</groupId>
-      <artifactId>struts2-core</artifactId>
-      <version>${struts2.version}</version>
+      <artifactId>struts2-config-browser-plugin</artifactId>
+      <version>${struts2Version}</version>
+      <scope>runtime</scope>
     </dependency>
 
-    <dependency>
+     <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-sitemesh-plugin</artifactId>
-      <version>${struts2.version}</version>
+      <version>${struts2Version}</version>
+       <scope>runtime</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.struts</groupId>
-      <artifactId>struts2-spring-plugin</artifactId>
-      <version>${struts2.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.struts</groupId>
-      <artifactId>struts2-config-browser-plugin</artifactId>
-      <version>${struts2.version}</version>
-    </dependency>
+    
   </dependencies>
 
-  <scm>
-    <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection>
-    <developerConnection>
-      scm:svn:http://svn.chorem.org/svn/bow/trunk
-    </developerConnection>
-    <url>http://www.chorem.org/repositories/browse/bow/trunk</url>
-  </scm>
-
-  <!-- ************************************************************* -->
-  <!-- *** Project Information ************************************* -->
-  <!-- ************************************************************* -->
-
-  <name>bow</name>
-  <description>bookmarks on web</description>
-  <inceptionYear>2010</inceptionYear>
-
-  <!-- ************************************************************* -->
-  <!-- *** Build Settings ****************************************** -->
-  <!-- ************************************************************* -->
-
-  <packaging>war</packaging>
-  
-  <properties>
-    <platform>chorem.org</platform>
-    <projectId>bow</projectId>
-
-    <nuitonUtilsVersion>2.0</nuitonUtilsVersion>
-    <nuitonI18nVersion>2.3</nuitonI18nVersion>
-    <wikittyVersion>3.0.4-SNAPSHOT</wikittyVersion>
-    <slf4jVersion>1.6.1</slf4jVersion>
-    <struts2.version>2.1.8.1</struts2.version>
-    
-	<i18n.bundles>fr_FR,en_GB</i18n.bundles>
-    <i18n.silent>true</i18n.silent>
-    <i18n.bundleOutputName>bow-i18n</i18n.bundleOutputName>
-    <i18n.bundleOutputDir>${basedir}/target/generated-sources/resources</i18n.bundleOutputDir>
-    <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent>
-
-    <!-- license to use  -->
-    <license.licenseName>agpl_v3</license.licenseName>
-  </properties>
-  
   <build>
     <resources>
       <resource>
@@ -202,6 +211,7 @@
 
     <pluginManagement>
       <plugins>
+
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
           <dependencies>
@@ -212,6 +222,19 @@
             </dependency>
           </dependencies>
         </plugin>
+
+        <plugin>
+          <groupId>org.nuiton.eugene</groupId>
+          <artifactId>maven-eugene-plugin</artifactId>
+          <version>${eugenePluginVersion}</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.nuiton.i18n</groupId>
+          <artifactId>maven-i18n-plugin</artifactId>
+          <version>${nuitonI18nVersion}</version>
+        </plugin>
+
       </plugins>
     </pluginManagement>
 
@@ -219,19 +242,17 @@
       <plugin>
         <groupId>org.nuiton.eugene</groupId>
         <artifactId>maven-eugene-plugin</artifactId>
-<!--        <version>2.1</version> -->
         <executions>
           <execution>
             <id>api generator</id>
             <phase>generate-sources</phase>
-<!--            <phase>process-sources</phase> -->
-
             <configuration>
               <inputs>
                 <input>zargo</input>
               </inputs>
-<!--              <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> -->
-              <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates>
+              <!--              <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> -->
+              <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator
+              </templates>
               <fullPackagePath>org.chorem.bow</fullPackagePath>
               <generatedPackages>org.chorem.bow</generatedPackages>
             </configuration>
@@ -253,7 +274,6 @@
       <plugin>
         <groupId>org.nuiton.i18n</groupId>
         <artifactId>maven-i18n-plugin</artifactId>
-        <version>${nuitonI18nVersion}</version>
         <executions>
           <execution>
             <id>scan-java-sources</id>
@@ -272,7 +292,8 @@
               </userRulesFiles>
               <namespaces>
                 <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s>
-                <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx>
+                <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
+                </sx>
                 <jsp>http://java.sun.com/JSP/Page</jsp>
               </namespaces>
             </configuration>


Property changes on: trunk/pom.xml
___________________________________________________________________
Added: svn:eol-style
   + native

    

r190 - trunk

tchemit＠users.chorem.org

tags

participants (1)