Merged 5.2.N-UPGRADES (5.2.1) to 5.2.N (5.2.1)

130660: Merged 5.2-UPGRADES (5.2.1) to 5.2.N-UPGRADES (5.2.1)
      << Some things have moved forwards on 5.2.N so the original commits are not the same >>
         - AuthUsers upgraded to the same as 5.2.N (5.2.0.1 -> 5.2.0.3)
         - isoparser upgraded to the same as 5.2.N (1.0-RC-15 to 1.0.2)
      125130: ACE-4055 Revert upgrade of json to 20160212: it has incompatible changes,
      125114: BDE-624 First batch of 3rd party upgrades in enterprise projects
        jasypt 1.9.1 -> 1.9.2
        vaadin 6.8.8 -> 6.8.16,
      125015: BDE-624 First batch of 3rd party upgrades
       Spring Framework 3.2.14.RELEASE -> 3.2.16.RELEASE
       Jackson2 2.3.2 -> 2.7.3
       httpcomponents 4.5.1 -> 4.5.2
       mysql driver 5.1.35 -> 5.1.38
       postgresql driver 9.4-1201-jdbc41 -> 9.4.1208.jre7
       slf4j 1.7.12 -> 1.7.21
       json 20090211 -> 20160212
       joda-time 2.8.1 -> 2.9.3
       commons-compress 1.9 -> 1.11
       commons-net 3.3 -> 3.4
       commons-validator 1.4.1 -> 1.5.0
       axiom 1.2.15 -> 1.2.18
       jaxb 2.2.6 -> 2.2.7
       myfaces 1.1.8 -> 1.1.10
       h2 1.4.187 -> 1.4.191 
       browsermob 2.1.0-beta-1 -> 2.1.0-beta-5
       javax.mail 1.5.2 -> 1.5.5
       derby 10.11.1.1 -> 10.12.1.1
       wss4j 1.5.12 -> 1.6.19
       XmlSchema 1.4.5 -> 1.4.7
       xstream 1.2.2 -> 1.3.1
       geronimo-ws-metadata_2.0_spec 1.1.2 -> 1.1.3
       stax-utils 20060502 -> 20070216
       bcprov 1.45 -> 1.46
       isoparser 1.0-RC-1 -> 1.0-RC-15
       metadata-extractor 2.6.2 -> 2.9.0 
       jsr107cache 1.0 -> 1.1
       concurrentlinkedhashmap 1.2 -> 1.4.2
       FastInfoset 1.2.2 -> 1.2.13
       groovy 2.4.4 -> 2.4.6
       jmagick 6.2.4 -> 6.6.9
       livetribe-jsr223 2.0.6 -> 2.0.7
       netcdf 4.2-min -> 4.2.20
       spring-social-facebook 1.0.0.RC1 -> 1.1.1.RELEASE
       spring-social-web 1.0.3.RELEASE -> 1.1.4.RELEASE
       spring-social-twitter 1.0.5.RELEASE -> 1.1.2.RELEASE
       spring-security-core 3.1.3.RELEASE -> 3.1.7.RELEASE
       aspectjrt 1.8.2 -> 1.8.7
       solr4 4.10.3 -> 4.10.4
       shale-test 1.0.4 -> 1.0.5,
   130709: REPO-482 The platform uses the simple-to-upgrade libraries for 5.2
      - UNDO metadata-extractor 2.6.2 -> 2.9.1 TikaAutoMetadataExtracterTest testImageVideo is failing.
             Had expected to have been able to take out the patch made in MNT-13920, but the metadata
             and properties now appear to be wrong in another way!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-15 23:12:42 +00:00
parent 62abd85155
commit 5a0ee49f6b

View File

@@ -160,7 +160,7 @@
<dependency> <dependency>
<groupId>org.apache.shale</groupId> <groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId> <artifactId>shale-test</artifactId>
<version>1.0.4</version> <version>1.0.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>