r275 - trunk - Jredmine-commits

12 Jul 2012

Author: tchemit
Date: 2012-07-13 01:25:29 +0200 (Fri, 13 Jul 2012)
New Revision: 275

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

Log:
clean pom

Modified:
   trunk/pom.xml

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

--- trunk/pom.xml	2012-07-12 23:25:15 UTC (rev 274)
+++ trunk/pom.xml	2012-07-12 23:25:29 UTC (rev 275)
@@ -22,7 +22,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>
 
@@ -33,14 +35,15 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom4redmineAndCentral</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>jredmine</artifactId>
   <version>1.4-SNAPSHOT</version>
 
   <modules>
-    <module>jredmine-client</module>
+    <module>jredmine-domain</module>
+    <module>jredmine-client-1.3.x</module>
     <module>jredmine-maven-plugin</module>
   </modules>
 
@@ -71,12 +74,23 @@
       </dependency>
 
       <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.1.2</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>helper-maven-plugin</artifactId>
         <version>${helperPluginVersion}</version>
         <scope>compile</scope>
         <exclusions>
           <exclusion>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+          </exclusion>
+
+          <exclusion>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
           </exclusion>
@@ -344,7 +358,7 @@
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-container-default</artifactId>
           </exclusion>
-           <exclusion>
+          <exclusion>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
           </exclusion>
@@ -375,7 +389,7 @@
         <version>2.6</version>
         <exclusions>
           <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
+            <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-velocity</artifactId>
           </exclusion>
           <exclusion>
@@ -390,7 +404,7 @@
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-mail-sender-javamail</artifactId>
           </exclusion>
-           <exclusion>
+          <exclusion>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-container-default</artifactId>
           </exclusion>
@@ -513,7 +527,7 @@
       <id>tchemit</id>
       <email>chemit at codelutin dot com</email>
       <organization>CodeLutin</organization>
-      <timezone>+2</timezone>
+      <timezone>Europe/Paris</timezone>
       <roles>
         <role>Developer</role>
       </roles>
@@ -523,7 +537,7 @@
       <id>ymartel</id>
       <email>ymartel at codelutin dot com</email>
       <organization>CodeLutin</organization>
-      <timezone>+2</timezone>
+      <timezone>Europe/Paris</timezone>
       <roles>
         <role>Developer</role>
       </roles>
@@ -544,20 +558,18 @@
     <!-- must be on a fixed version, not on the snapshot to make possible release -->
     <jredminePluginVersion>1.3</jredminePluginVersion>
 
-    <doxiaVersion>1.2</doxiaVersion>
+    <doxiaVersion>1.3</doxiaVersion>
 
     <helperPluginVersion>1.5-SNAPSHOT</helperPluginVersion>
 
+    <license.addJavaLicenseAfterPackage>
+      true
+    </license.addJavaLicenseAfterPackage>
+
     <!-- documentation is in apt -->
     <siteSourcesType>apt</siteSourcesType>
 
-    <!-- test config -->
-    <test.redmineUrl>http://www.mynuiton.org</test.redmineUrl>
-    <test.redmineUsername>chemit</test.redmineUsername>
-    <test.redminePassword>azer</test.redminePassword>
-    <test.verbose>false</test.verbose>
-    <test.encoding>UTF-8</test.encoding>
-
+    <jredmine-test.server>true</jredmine-test.server>
   </properties>
 
   <build>
@@ -570,11 +582,15 @@
           <configuration>
             <environmentVariables>
               <test.redmineUrl>${test.redmineUrl}</test.redmineUrl>
-              <test.redmineUsername>${test.redmineUsername}
-              </test.redmineUsername>
-              <test.redminePassword>${test.redminePassword}
-              </test.redminePassword>
-              <test.verbose>${test.verbose}</test.verbose>
+              <jredmine-test.login>
+                ${jredmine-test.login}
+              </jredmine-test.login>
+              <jredmine-test.password>
+                ${jredmine-test.password}
+              </jredmine-test.password>
+              <jredmine-test.verbose>
+                ${jredmine-test.verbose}
+              </jredmine-test.verbose>
             </environmentVariables>
           </configuration>
         </plugin>

    

r275 - trunk

tchemit＠users.nuiton.org

tags

participants (1)