r173 - in trunk: . jredmine-client maven-jredmine-plugin - Jredmine-commits

21 Nov 2010

Author: tchemit
Date: 2010-11-21 17:15:46 +0100 (Sun, 21 Nov 2010)
New Revision: 173

Url: http://nuiton.org/repositories/revision/jredmine/173

Log:
Evolution #1087: Optimize dependencies

Modified:
   trunk/jredmine-client/pom.xml
   trunk/maven-jredmine-plugin/pom.xml
   trunk/pom.xml

Modified: trunk/jredmine-client/pom.xml
===================================================================

--- trunk/jredmine-client/pom.xml	2010-11-21 14:30:01 UTC (rev 172)
+++ trunk/jredmine-client/pom.xml	2010-11-21 16:15:46 UTC (rev 173)
@@ -50,6 +50,27 @@
     </dependency>
 
     <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>test</scope>

Modified: trunk/maven-jredmine-plugin/pom.xml
===================================================================
--- trunk/maven-jredmine-plugin/pom.xml	2010-11-21 14:30:01 UTC (rev 172)
+++ trunk/maven-jredmine-plugin/pom.xml	2010-11-21 16:15:46 UTC (rev 173)
@@ -24,7 +24,9 @@
   #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/maven-v4_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/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -61,6 +63,11 @@
       <artifactId>maven-helper-plugin</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+
     <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -92,7 +99,23 @@
       <artifactId>maven-core</artifactId>
     </dependency>
 
+
     <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-changes-plugin</artifactId>
     </dependency>
@@ -100,9 +123,46 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <scope>compile</scope>
+      <scope>runtime</scope>
     </dependency>
 
+    <dependency>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-velocity</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-i18n</artifactId>
+    </dependency>
+
+    <!-- doxia -->
+
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-site-renderer</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-decoration-model</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-sink-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-xhtml</artifactId>
+    </dependency>
+
     <!-- tests dependencies -->
 
     <dependency>
@@ -204,7 +264,8 @@
                 <pomInclude>report/pom.xml</pomInclude>
               </pomIncludes>
               <postBuildHookScript>verify</postBuildHookScript>
-              <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
+              <localRepositoryPath>${basedir}/target/local-repo
+              </localRepositoryPath>
               <settingsFile>src/it/settings.xml</settingsFile>
               <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo>
             </configuration>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-11-21 14:30:01 UTC (rev 172)
+++ trunk/pom.xml	2010-11-21 16:15:46 UTC (rev 173)
@@ -23,7 +23,9 @@
   <http://www.gnu.org/licenses/lgpl-3.0.html>.
   #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/maven-v4_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/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -48,7 +50,8 @@
   <!-- Source control management. -->
   <scm>
     <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection>
-    <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</developerConnection>
+    <developerConnection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk
+    </developerConnection>
     <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url>
   </scm>
 
@@ -149,6 +152,36 @@
       </dependency>
 
       <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-velocity</artifactId>
+        <version>1.1.8</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-i18n</artifactId>
+        <version>1.0-beta-7</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <version>1.5</version>
+      </dependency>
+
+      <dependency>
+        <groupId>velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <version>1.5</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.4</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-project</artifactId>
         <version>${mavenVersion}</version>
@@ -171,6 +204,27 @@
 
       <dependency>
         <groupId>org.apache.maven</groupId>
+        <artifactId>maven-model</artifactId>
+        <version>${mavenVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>${mavenVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven.reporting</groupId>
+        <artifactId>maven-reporting-api</artifactId>
+        <version>${mavenVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven</groupId>
         <artifactId>maven-core</artifactId>
         <version>${mavenVersion}</version>
         <scope>provided</scope>
@@ -234,18 +288,44 @@
         </exclusions>
       </dependency>
 
+      <!-- doxia -->
+
       <dependency>
-        <groupId>org.sonatype.plexus</groupId>
-        <artifactId>plexus-sec-dispatcher</artifactId>
-        <version>1.4</version>
+        <groupId>org.apache.maven.doxia</groupId>
+        <artifactId>doxia-site-renderer</artifactId>
+        <version>${doxiaVersion}</version>
       </dependency>
 
       <dependency>
+        <groupId>org.apache.maven.doxia</groupId>
+        <artifactId>doxia-decoration-model</artifactId>
+        <version>${doxiaVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven.doxia</groupId>
+        <artifactId>doxia-sink-api</artifactId>
+        <version>${doxiaVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven.doxia</groupId>
+        <artifactId>doxia-module-xhtml</artifactId>
+        <version>${doxiaVersion}</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.sonatype.plexus</groupId>
-        <artifactId>plexus-cipher</artifactId>
-        <version>1.5</version>
+        <artifactId>plexus-sec-dispatcher</artifactId>
+        <version>1.4</version>
       </dependency>
 
+      <!--<dependency>-->
+      <!--<groupId>org.sonatype.plexus</groupId>-->
+      <!--<artifactId>plexus-cipher</artifactId>-->
+      <!--<version>1.5</version>-->
+      <!--</dependency>-->
+
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-changes-plugin</artifactId>
@@ -267,6 +347,10 @@
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
 
@@ -353,12 +437,6 @@
         </exclusions>
       </dependency>
 
-      <!--dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <scope>test</scope>
-      </dependency-->
-
     </dependencies>
   </dependencyManagement>
 
@@ -401,6 +479,8 @@
     <!-- must be on a fixed version, not on the snapshot to make possible release -->
     <jredminePluginVersion>1.1.4</jredminePluginVersion>
 
+    <doxiaVersion>1.0</doxiaVersion>
+
     <!-- documentation is in apt -->
     <siteSourcesType>apt</siteSourcesType>
 
@@ -423,8 +503,10 @@
           <configuration>
             <environmentVariables>
               <test.redmineUrl>${test.redmineUrl}</test.redmineUrl>
-              <test.redmineUsername>${test.redmineUsername}</test.redmineUsername>
-              <test.redminePassword>${test.redminePassword}</test.redminePassword>
+              <test.redmineUsername>${test.redmineUsername}
+              </test.redmineUsername>
+              <test.redminePassword>${test.redminePassword}
+              </test.redminePassword>
               <test.verbose>${test.verbose}</test.verbose>
             </environmentVariables>
           </configuration>

    

r173 - in trunk: . jredmine-client maven-jredmine-plugin

tchemit＠users.nuiton.org

tags

participants (1)