Return-Path: 
 <jetspeed-dev-return-30963-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 69464 invoked from network); 10 Nov 2007 18:27:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 10 Nov 2007 18:27:03 -0000
Received: (qmail 75931 invoked by uid 500); 10 Nov 2007 18:26:50 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 75904 invoked by uid 500); 10 Nov 2007 18:26:49 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 75893 invoked by uid 99); 10 Nov 2007 18:26:49 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Nov 2007 10:26:49 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Nov 2007 18:27:40 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 219E61A9832; Sat, 10 Nov 2007 10:26:38 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r593803 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3:
 components/cm/pom.xml etc/editors/m2.classpath pom.xml
Date: Sat, 10 Nov 2007 18:26:37 -0000
To: jetspeed-dev@portals.apache.org
From: taylor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071110182638.219E61A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: taylor
Date: Sat Nov 10 10:26:36 2007
New Revision: 593803

URL: http://svn.apache.org/viewvc?rev=593803&view=rev
Log:
update M2 build with jmock deps
patch from Mohan Kannapareddy

Modified:
    portals/jetspeed-2/branches/JETSPEED-2.1.3/components/cm/pom.xml
    portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/editors/m2.classpath
    portals/jetspeed-2/branches/JETSPEED-2.1.3/pom.xml

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/cm/pom.xml?rev=593803&r1=593802&r2=593803&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/cm/pom.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/cm/pom.xml Sat Nov 10 10:26:36 2007
@@ -124,7 +124,7 @@
         <!-- Runtime Dependencies -->
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
+            <artifactId>cglib-nodep</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/editors/m2.classpath
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/editors/m2.classpath?rev=593803&r1=593802&r2=593803&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/editors/m2.classpath (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/etc/editors/m2.classpath Sat Nov 10 10:26:36 2007
@@ -54,7 +54,7 @@
 	<classpathentry excluding="**/.svn/*" kind="src" path="app-servers/security/jboss/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/demo/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/gems/src/java"/>
-	<classpathentry excluding="**/.svn/*" kind="src" path="applications/j2-admin/src/java"/>
+	<classpathentry excluding="**/.svn/*|**/log4j.properties" kind="src" path="applications/j2-admin/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/rss/src/java"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
@@ -80,7 +80,7 @@
     <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/>
     <classpathentry kind="var" path="M2_REPO/commons-configuration/commons-configuration/1.1/commons-configuration-1.1.jar"/>
     <classpathentry kind="var" path="M2_REPO/mockrunner/mockrunner/0.3.8/mockrunner-0.3.8.jar"/>
-    <classpathentry kind="var" path="M2_REPO/jmock/jmock/1.0.1/jmock-1.0.1.jar"/>
+    <classpathentry kind="var" path="M2_REPO/jmock/jmock/1.2.0/jmock-1.2.0.jar"/>
     <classpathentry kind="var" path="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar"/>
     <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar"/>
     <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
@@ -92,7 +92,7 @@
     <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
     <classpathentry kind="var" path="M2_REPO/rome/rome/0.8/rome-0.8.jar"/>
     <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/>
-    <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+    <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
     <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0.5/spring-2.0.5.jar"/>
     <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0.5/spring-mock-2.0.5.jar"/>
     <classpathentry kind="var" path="M2_REPO/org/springframework/spring-portlet/2.0.5/spring-portlet-2.0.5.jar"/>
@@ -115,6 +115,7 @@
     <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
     <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.2.4/ehcache-1.2.4.jar"/>
     <classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/>
+    <classpathentry kind="var" path="M2_REPO/jmock/jmock-cglib/1.2.0/jmock-cglib-1.2.0.jar"/>
     <classpathentry kind="var" path="M2_REPO/myfaces/myfaces-api/1.1.5/myfaces-api-1.1.5.jar"/>
     <classpathentry kind="var" path="M2_REPO/myfaces/myfaces-impl/1.1.5/myfaces-impl-1.1.5.jar"/>
     <classpathentry kind="var" path="M2_REPO/myfaces/tomahawk/1.1.5/tomahawk-1.1.5.jar"/>

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/pom.xml?rev=593803&r1=593802&r2=593803&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/pom.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/pom.xml Sat Nov 10 10:26:36 2007
@@ -132,7 +132,8 @@
 
         <!-- Build Dependency Version Properties -->
         <ant.version>1.6.5</ant.version>
-        <jmock.version>1.0.1</jmock.version>
+        <jmock.version>1.2.0</jmock.version>
+        <jmock-cglib.version>1.1.0</jmock-cglib.version>
         <junit.version>3.8.1</junit.version>
         <mockrunner.version>0.3.8</mockrunner.version>
         <org.apache.maven.artifact.ant.version>2.0.4</org.apache.maven.artifact.ant.version>
@@ -148,7 +149,7 @@
         <!-- Project Dependency Version Properties -->
         <aopalliance.version>1.0</aopalliance.version>
          <castor.version>1.1.1-xml</castor.version> 
-        <cglib.version>2.1_3</cglib.version>
+        <cglib-nodep.version>2.1_3</cglib-nodep.version>
         <commons-beanutils.version>1.7.0</commons-beanutils.version>
         <commons-betwixt.version>20061115</commons-betwixt.version>        
         <commons-codec.version>1.3</commons-codec.version>
@@ -526,8 +527,8 @@
             <!-- Spring Framework -->
             <dependency>
                 <groupId>cglib</groupId>
-                <artifactId>cglib</artifactId>
-                <version>${cglib.version}</version>
+                <artifactId>cglib-nodep</artifactId>
+                <version>${cglib-nodep.version}</version>
             </dependency>
             <dependency>
                 <groupId>aopalliance</groupId>
@@ -690,6 +691,12 @@
                 <groupId>jmock</groupId>
                 <artifactId>jmock</artifactId>
                 <version>${jmock.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>jmock</groupId>
+                <artifactId>jmock-cglib</artifactId>
+                <version>${jmock-cglib.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org