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
This commit is contained in:
Alan Davis
2014-04-02 21:26:23 +00:00
parent 5a3aa69ac0
commit 2598d95956
2 changed files with 2 additions and 21 deletions
+1 -1
View File
@@ -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"/>
+1 -20
View File
@@ -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>