Return-Path: 
 <commits-return-8940-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
Delivered-To: apmail-struts-commits-archive@minotaur.apache.org
Received: (qmail 747 invoked from network); 1 Jan 2011 20:43:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 1 Jan 2011 20:43:47 -0000
Received: (qmail 27469 invoked by uid 500); 1 Jan 2011 20:43:47 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 27432 invoked by uid 500); 1 Jan 2011 20:43:46 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 27425 invoked by uid 99); 1 Jan 2011 20:43:46 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jan 2011 20:43:46 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jan 2011 20:43:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4EF3D23889BF; Sat,  1 Jan 2011 20:43:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1054288 - in /struts/struts2/trunk: pom.xml
 xwork-core/pom.xml
Date: Sat, 01 Jan 2011 20:43:25 -0000
To: commits@struts.apache.org
From: lukaszlenart@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110101204325.4EF3D23889BF@eris.apache.org>

Author: lukaszlenart
Date: Sat Jan  1 20:43:24 2011
New Revision: 1054288

URL: http://svn.apache.org/viewvc?rev=1054288&view=rev
Log:
Cleans poms and dependency management

Modified:
    struts/struts2/trunk/pom.xml
    struts/struts2/trunk/xwork-core/pom.xml

Modified: struts/struts2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1054288&r1=1054287&r2=1054288&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Sat Jan  1 20:43:24 2011
@@ -73,7 +73,8 @@
     <properties>
         <currentVersion>${project.version}</currentVersion>
         <struts2.springPlatformVersion>2.5.6</struts2.springPlatformVersion>
-        <ognl.version>3.0</ognl.version>
+        <ognl.version>3.0.1</ognl.version>
+        <asm.version>3.1</asm.version>
     </properties>
 
     <profiles>
@@ -402,19 +403,31 @@
                 <artifactId>ognl</artifactId>
                 <version>${ognl.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>javassist</groupId>
                 <artifactId>javassist</artifactId>
                 <version>3.8.0.GA</version>
                 <scope>test</scope>
             </dependency>
-
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>4.8.2</version>
-                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>2.1_3</version>
             </dependency>
 
             <dependency>
@@ -447,6 +460,11 @@
 
             <!-- Commons -->
             <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+            <dependency>
                 <groupId>commons-fileupload</groupId>
                 <artifactId>commons-fileupload</artifactId>
                 <version>1.2.1</version>
@@ -454,12 +472,12 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>1.3.2</version>
+                <version>1.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
-                <version>2.1</version>
+                <version>2.5</version>
             </dependency>
             <dependency>
                 <groupId>commons-el</groupId>
@@ -472,35 +490,51 @@
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
                 <version>${struts2.springPlatformVersion}</version>
-                <scope>test</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring</artifactId>
                 <version>${struts2.springPlatformVersion}</version>
-                <scope>compile</scope>
-                <optional>true</optional>
             </dependency>
-
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-webmvc-portlet</artifactId>
                 <version>${struts2.springPlatformVersion}</version>
-                <scope>test</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
                 <version>${struts2.springPlatformVersion}</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+                <version>${struts2.springPlatformVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aspects</artifactId>
+                <version>${struts2.springPlatformVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>${struts2.springPlatformVersion}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-test</artifactId>
                 <version>${struts2.springPlatformVersion}</version>
-                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context-support</artifactId>
+                <version>${struts2.springPlatformVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>${struts2.springPlatformVersion}</version>
             </dependency>
 
             <dependency>
@@ -552,7 +586,6 @@
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>1.2.9</version>
-                <scope>test</scope>
             </dependency>
 
             <dependency>

Modified: struts/struts2/trunk/xwork-core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/pom.xml?rev=1054288&r1=1054287&r2=1054288&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/pom.xml (original)
+++ struts/struts2/trunk/xwork-core/pom.xml Sat Jan  1 20:43:24 2011
@@ -21,10 +21,7 @@
     </scm>
 
     <properties>
-        <currentVersion>${pom.version}</currentVersion>
-        <struts2.springPlatformVersion>2.5.6</struts2.springPlatformVersion>
-        <asm.version>3.1</asm.version>
-        <ognl.version>3.0</ognl.version>
+        <currentVersion>${project.version}</currentVersion>
     </properties>
 
     <profiles>
@@ -260,104 +257,87 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>1.4</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>ognl</groupId>
             <artifactId>ognl</artifactId>
-            <version>${ognl.version}</version>
         </dependency>
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
-            <version>${asm.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-commons</artifactId>
-            <version>${asm.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <scope>compile</scope>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.1</version>
             <optional>true</optional>
             <classifier>jdk15</classifier>
         </dependency>
@@ -365,20 +345,17 @@
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-core</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>2.4</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.8.0.GA</version>
             <scope>test</scope>
         </dependency>