From 2598d9595624a5a335cc474b241d93a38f4e4eb8 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 2 Apr 2014 21:26:23 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    65494:
 ACE-969 Upgraded Apache Commons components:    * commons-beanutils from 1.7.0
 to 1.9.1    * commons-codec from 1.5 to 1.9    * commons-compress from 1.4.1
 to 1.8    * commons-digester from 1.6 to 1.8.1    * commons-discovery from
 0.2 to 0.5    * commons-jxpath from 1.2 to 1.3    * commons-logging from
 1.1.1 to 1.1.3    * commons-net from 2.2 to 3.3    * commons-pool from 1.5.5
 to 1.6

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66240 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .classpath |  2 +-
 pom.xml    | 21 +--------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/.classpath b/.classpath
index 39f2565d5..2245980a9 100644
--- a/.classpath
+++ b/.classpath
@@ -7,7 +7,7 @@
 	<classpathentry kind="src" path="/Repository"/>
 	<classpathentry kind="src" path="/Core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Remote API"/>
-	<classpathentry kind="lib" path="/3rd Party/lib/commons/commons-jxpath-1.2.jar"/>
+	<classpathentry kind="lib" path="/3rd Party/lib/commons/commons-jxpath-1.3.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/3rd Party"/>
 	<classpathentry kind="lib" path="/3rd Party/lib/xercesImpl-2.10.0-alfresco-patched.jar"/>
 	<classpathentry kind="lib" path="/3rd Party/lib/alfresco-xmlfactory-1.0.1.jar"/>
diff --git a/pom.xml b/pom.xml
index 1da80155e..a0b4ce9b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,20 +101,7 @@
         <dependency>
             <groupId>commons-jxpath</groupId>
             <artifactId>commons-jxpath</artifactId>
-            <version>1.2</version>
             <exclusions>
-                <exclusion>
-                    <groupId>commons-beanutils</groupId>
-                    <artifactId>commons-beanutils</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-collections</groupId>
-                    <artifactId>commons-collections</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>junit</groupId>
                     <artifactId>junit</artifactId>
@@ -132,26 +119,21 @@
         <dependency>
             <groupId>commons-modeler</groupId>
             <artifactId>commons-modeler</artifactId>
-            <version>1.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging-api</artifactId>
                 </exclusion>
+            </exclusions>
                 <exclusion>
                     <groupId>xml-apis</groupId>
                     <artifactId>xml-apis</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>commons-digester</groupId>
-                    <artifactId>commons-digester</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
 		</dependency>
         <dependency>
             <groupId>net.sf.chiba</groupId>
@@ -513,7 +495,6 @@
 			    <dependency>
 			       <groupId>commons-logging</groupId>
 			       <artifactId>commons-logging</artifactId>
-			       <version>1.1.1</version>
 			       <!-- This is needed for Maven tomcat run -->
 			       <scope>runtime</scope>
 		        </dependency>