[Smartfrog-checkins] SF.net SVN: smartfrog: [5842] trunk/core/components

[<st...@us...>]

Revision: 5842
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=5842&view=rev
Author:   steve_l
Date:     2008-01-31 15:05:07 -0800 (Thu, 31 Jan 2008)

Log Message:
-----------
fix up some ivy/maven templates

Modified Paths:
--------------
    trunk/core/components/ec2/ivy.xml
    trunk/core/components/junit/ivy.xml
    trunk/core/components/junit/project-template.pom
    trunk/core/components/libraries.properties
    trunk/core/components/testng/ivy.xml

Modified: trunk/core/components/ec2/ivy.xml
===================================================================
--- trunk/core/components/ec2/ivy.xml	2008-01-31 23:04:22 UTC (rev 5841)
+++ trunk/core/components/ec2/ivy.xml	2008-01-31 23:05:07 UTC (rev 5842)
@@ -116,6 +116,7 @@
         rev="${commons-httpclient.version}"
         conf="compile->master;test,runtime,redist->default">
         <exclude org="commons-logging"/>
+        <exclude org="junit"/>
     </dependency>
 
     <!--file upload-->

Modified: trunk/core/components/junit/ivy.xml
===================================================================
--- trunk/core/components/junit/ivy.xml	2008-01-31 23:04:22 UTC (rev 5841)
+++ trunk/core/components/junit/ivy.xml	2008-01-31 23:05:07 UTC (rev 5842)
@@ -58,7 +58,7 @@
         conf="compile->master;runtime->default"/>
     <dependency org="junit"
         name="junit"
-        rev="${junit.version}"
+        rev="${junit3.version}"
         conf="compile->default;redist->default"/>
   </dependencies>
 </ivy-module>
\ No newline at end of file

Modified: trunk/core/components/junit/project-template.pom
===================================================================
--- trunk/core/components/junit/project-template.pom	2008-01-31 23:04:22 UTC (rev 5841)
+++ trunk/core/components/junit/project-template.pom	2008-01-31 23:05:07 UTC (rev 5842)
@@ -11,7 +11,7 @@
   <artifactId>sf-junit</artifactId>
   <packaging>jar</packaging>
   <version>${smartfrog.version}</version>
-  <description>Components to deploy ${junit.version} components remotely</description>
+  <description>Components to deploy ${junit3.version} components remotely</description>
   <dependencies>
     <dependency>
       <groupId>org.smartfrog</groupId>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
+      <version>${junit3.version}</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: trunk/core/components/libraries.properties
===================================================================
--- trunk/core/components/libraries.properties	2008-01-31 23:04:22 UTC (rev 5841)
+++ trunk/core/components/libraries.properties	2008-01-31 23:05:07 UTC (rev 5842)
@@ -7,7 +7,6 @@
 activation.version=1.1
 apache.ant.version=1.7.0
 ant-testutil.version=${apache.ant.version}
-ant.m2.version=1.6.5
 asm.version=3.0
 bsh.version=1.3.0
 bsh-core.version=${bsh.version}
@@ -18,7 +17,7 @@
 commons-dbutils.version=1.0
 commons-digester.version=1.8
 commons-fileupload.version=1.2
-commons-httpclient.version=3.0
+commons-httpclient.version=3.1
 commons-lang.version=2.1
 commons-logging.version=1.0.4
 commons-net.version=1.4.1
@@ -38,7 +37,9 @@
 jetty.servlet.version=2.5
 jsch.version=0.1.31
 jsp-api.version=2.0
-junit.version=3.8.2
+junit3.version=3.8.2
+junit4.version=4.4
+junit.version=${junit3.version}
 log4j.version=1.2.13
 mail.version=1.4
 mx4j.version=3.0.1

Modified: trunk/core/components/testng/ivy.xml
===================================================================
--- trunk/core/components/testng/ivy.xml	2008-01-31 23:04:22 UTC (rev 5841)
+++ trunk/core/components/testng/ivy.xml	2008-01-31 23:05:07 UTC (rev 5842)
@@ -31,8 +31,8 @@
   <publications>
     <!--get the artifact from our module name-->
     <artifact conf="master"/>
-    <artifact name="sf-junit-javadocs" conf="documentation" ext="zip"/>
-    <artifact name="sf-junit-documentation" conf="documentation" ext="zip"/>
+    <artifact name="sf-testng-javadocs" conf="documentation" ext="zip"/>
+    <artifact name="sf-testng-documentation" conf="documentation" ext="zip"/>
   </publications>
   <dependencies>
     <dependency org="org.smartfrog"
@@ -56,10 +56,6 @@
         name="sf-xunit" changing="true"
         rev="latest.integration"
         conf="compile->master;runtime->default"/>
-<!--    <dependency org="junit"
-        name="junit"
-        rev="${junit.version}"
-        conf="compile->default;redist->default"/>-->
     <dependency org="testng"
         name="testng"
         rev="${testng.version}"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.